changed some naming and restructured styles to use less of the cascade
updated nav breakpoint
renamed menu file to fit convention, relinked where needed
diet stuffs
updated nav columns
Merge branch 'master' of git://github.com/johnshopkins/machado

Conflicts:
	dist/css/ie7.css.map
	dist/css/main.css.map
	dist/js/home.js
	dist/js/page.js