These are the changes to the mailer.
Added email configurations to environment/development and /production
Merge branch 'master' into trish_mailer_two
Merge branch 'trish_mailer_two'