ugh
Merge branch 'master' of https://github.com/lsemesky/baltimore311

Conflicts:
	choropleth.js
real merge