Change to get email settings working on heroku.
Fix mailer so that it now calls the deliver method so mail actually gets delivered.