new version of rails
Merge branch 'master' of https://github.com/cbnoonan/mailer