configure mailer for dev and production environments

change production mailer domain env variable

repair action mailer for production
fix merge conflict re: env variables
fix conflict in dev and prod environments for email
fix error in devevelopment.rb