moving mail config into an initializer and a config/smtp.yml file
Merge branch 'actionmailer-config' into deploy

Conflicts:
	config/initializers/action_mailer.rb