Angular templateUrl stuff and css changes
Merge branch 'master' of https://github.com/NodePhilly/nodeph2014

Conflicts:
	app.js
	public/css/style.css
	public/js/angular/controllers/ContactCtrl.js
	views/contact/index.jade
	views/index.jade