clean up
Merge branch 'master' of https://github.com/cmoody/BackboneBoilerplate

Conflicts:
	src/css/partials/bars.less
	src/js/app/navTop/tpl/nav.html