Merge pull request #6 from danfunk/feature/scheduled_emails

Feature/scheduled emails
Merge branch 'master' into feature/scheduled_emails