better source
Merge branch 'master' of github.com:tlevine/socrata-analysis

Conflicts:
	python/run.py