contact form
add simple form
remove unicorn gem
add localization
Merge branch 'master' of github.com:mashine-hq/locomotive

Conflicts:
	Gemfile
	Gemfile.lock