Getting the mailgun delivery method to work with both devise and custom mailers
Merge branch 'master' of http://github.com/jcrosen/wedding-prototype

Conflicts:
	app/modules/mailgun.rb