Changed a couple of things

Moved the email query into the Create email function.
Merge pull request #19 from ArgoPost/SubscrpitonNotification

Changed a couple of things