pulling in Phil's changes
Merge branch 'master' of https://github.com/PoorlyWritten/django-mailbot