refine location details
plug in scroller directive; rebuild minified html
Merge branch 'master' of github.com:simshanith/compute-midwest-2014

Conflicts:
	public/assets/scripts/main.pkgd.js
	public/assets/styles/main.css