repairs to action mailer in user controller, config/environments/development.rb uses mailcatcher and config/environments/production.rb uses gmail
merge conflict resolution