Sync'ed dev with master after Django/static merge
Merge branch 'master' into dev

Conflicts:
	tigerhack/marker/templates/index.html
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
Some late nite commits javascript verifying user input all ajaxxy if it worked right.
Merge branch 'dev' of https://github.com/faulteh/tiger-govhack into dev
clean up some typos