overdue changes
Merge branch 'develop' of http://github.com/chancegray/emailer into develop
overdue changes