mailchimp and sendmail
Merge branch 'master' of https://github.com/erikanderson/edawebdesign

Conflicts:
	config/application.yml