devise mailer design
cleanup
Merge branch 'devel' of github.com:18F/myusa-server into feature/mail-templates
forgot to commit test change
changes per github issue comments
Merge branch 'devel' of github.com:18F/myusa-server into feature/mail-templates

Conflicts:
	Gemfile
Merge pull request #286 from 18F/feature/mail-templates

Feature/mail templates