adding tests and config for user mailer
initial work on user mailer
all tests for user mailer working
fixing merge conflicts in user.rb model