trying to get google map to inherit full page inner
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop

Conflicts:
	dist/css/main.css.map
	dist/js/fullpage-map.js
	dist/js/home.js
	dist/js/page.js
	dist/js/search.js
dist
super dist