New way of specifying city metadata.
Merge branch 'master' of github.com:codeforamerica/click_that_hood

Conflicts:
	public/js/data.js
Removing data.js since it is auto-generated.
Adding .metadata.json files for new cities.
Fixing syntax for newly-added metadata files; Adding template metadata file.