Getting ready to push to heroku
Added mailer and other changes