Just did stuff for the google map, though it does not display correctly yet
Merge branch 'master' of github.com:liquidtrends/socialhack

Conflicts:
	public/templates/map-search.html
	views/index.ejs