Create UserMailer and associated spec file and views.  Set up config environments.
Remove action mailer tests from spec. Not needed
resolve merge conflicts