Merge branch 'develop'
version bump
consolidate requirements and version bump
Add hook for users to disable emails completely.

Separate from settings.