OK, OK, OK, Need to stop being clever with this S3 stuff
Merge branch 'master' of github.com:open-city/civic-json-worker

Conflicts:
	app.py
Merge branch 'master' of github.com:open-city/civic-json-worker
Added project needs to project details