added location info to pins
Merge branch 'master' of git://github.com/johnshopkins/machado

Conflicts:
	dist/js/fullpage-map.js
	dist/js/home.js
	dist/js/page.js