basic mailer config
Merge branch 'master' into devise