Untested and unrun changes. Made on an airplane, and I forgot to run 'bundle' before I left an internet connection. Ho hum.
Merge branch 'master' of github.com:kmcphillips/gracehrabi.com

Conflicts:
	app/models/contact.rb
	spec/models/contact_spec.rb