Minor import tweak in test file
Removed pointless complication of jarow
Moved to new geolocation table

us_cities_merged combines the core of us_cities with about 3000 cities
which were missing from the database. The cities were derived from a
subset of the usloc database.