Merge branch 'contact-form'

Conflicts:
	keystone.js
	public/css/contact.css
	public/css/main.css
	templates/layouts/default.jade
	templates/views/contact.jade