Merge branch 'master' into dev

Conflicts:
	tigerhack/marker/templates/index.html
Merge branch 'dev' of https://github.com/faulteh/tiger-govhack into dev
fruitlessly trying to add kml file layers from the list server
Merge branch 'dev' of https://github.com/faulteh/tiger-govhack into dev
clean up some typos