Rearranging js files
Merge branch 'master' of heroku.com:jmh-com

Conflicts:
	app/views/layouts/application.html.haml