COMMITTED VIA CIRCLECI: cities.geojson update
more tests
Merge branch 'master' of github.com:mapzen/metroextractor-cities
Merge branch 'master' into rename_cities
use underscore to separate city from state/country if present