Actionmailer initializer
Remove some action mailer configs
Merge branch 'master' of heroku.com:infozdrave

Conflicts:
	config/initializers/actionmailer.rb
Ignore db config