Fix instructions in README
Merge branch 'master' into db-city
Update for city-level database