Minor cleanup
Config
Merge branch 'master' of https://github.com/fourmation/Email