Updated import locations for test files
Updated expected test result
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.
Consolidate hardcoded parameters
Include uppercase to mirror old rev_wrd functionality
Return default parser
Removed zipcode checking from geolocation

Zipcodes are not a reliable source of information.
Merge remote-tracking branch 'upstream/master'
Removed references to zipcodes
Excised mentions of zipcode from geocoding
Remove unnecessary zipcodes, restore necessary

Some "zipcode" fields are retained to keep the same output format as
before. However, they should all now return an emptry string, clarifying
that there is no actual information in the field. The 0 used before was
potentially confusing.
Update integration tests for removed zipcodes

The zipcode fields should now consistently be ""
Remove obsolete function
Updated unit tests for zipcodeless geocoding
Merge branch 'master' into laironald-sqlalchemy
ignore fake-contents of further_classification if we can't find a tag
Merge remote-tracking branch 'upstream/master' into sqlalchemy

Conflicts:
	lib/handlers/grant_handler_v42.py
	lib/handlers/grant_handler_v44.py
remove alchemy.db on make spotless