Closes #11
Merge pull request #15 from benastan/features/email_preferences#11

Closes #11