a lot of stuff for decider and other general things
Merge branch 'master' of github.com:simshanith/compute-midwest-2014

Conflicts:
	public/assets/scripts/controllers/index.js
	public/assets/scripts/main.pkgd.js
	public/assets/styles/main.css
	public/assets/styles/reset.css
	public/index.html
	src/markup/htdocs/index.jade
	src/scripts/lib/controllers/index.js
	src/styles/lib/_globals.styl