Added checks before references to proposal_type.notify_email, because it is possible for it to be null.
Merge branch 'master' of https://github.com/ben-denham/zookeepr