mailer fix?
Merge branch 'master' of https://github.com/twuster/rails-final-project