adding template
Merge branch 'devel' of github.com:18F/myusa-server into feature/contact-email-template
updating mailer test
creating shared mail template
Merge branch 'devel' into feature/contact-email-template
Update formating (2 spaces), remove comment, fix image sizes
Minor tweaks to improve email readability
Let email defaults take over, reduce config overhead

Fix two things:
- the reply-to is already being set to myusa@gsa.gov by
  the action mailer defaults
- emails for notifications should NOT come from
  no-reply@[app_domain]
  Instead they should come from the default myusa address
  no-reply@[myusa_host]

This commit fixes these items.
Add failure conditions for contact form

If the form fails, show a failure message to the user.
Remove borders in emails, since we don't want them.
Make contact form more usable

- Subject updated to tell you who it is from
- Image/logo update to be the right size
Update spec for new contact email subject
Merge pull request #377 from 18F/feature/contact-email-template

Update email templates and move contact form to standard template.
add comments explaining redundant app ownership
Merge remote-tracking branch 'origin/devel' into feature/admin_role

Conflicts:
	app/models/user_action.rb
	config/initializers/devise.rb
	db/schema.rb
Merge branch 'feature/admin_role' into feature/2fa

Conflicts:
	app/models/user.rb
	config/initializers/devise.rb
	db/schema.rb
Handle errors in SMS 2FA

- handle errors
- use factors/sms routes for resend, etc
- support resend code