Email configuration changes
Merge pull request #5 from sanjoy87/master

Email configuration changes