Make SMTP authentication mechanism configurable.
Merge branch 'smtp-auth-option' into hummingbird

Conflicts:
	config/environments/production.rb