styling and map stuff
Merge branch 'master' of https://github.com/bguggs/EcocampHackathon2014

Conflicts:
	site/main.css