Add ability to disable email system
Merge pull request #14 from zeiv/master

Add ability to disable email system