Updated integration tests for new database

Necessary for the change from usloc to us_cities
Merge pull request #20 from gtfierro/master

Add infrastructure to choose parser based on date.
Updated tests for relocated xml handlers
Remove rev_wrd, don't check first 3 letters
Removed rev_wrd, removed first 3 letters test
Merge branch 'master' of github.com:Vadskye/patentprocessor

Conflicts:
	lib/geocode_setup.py

Corrected datase used
Undo weird merge stuff
Restore City3, clarify hardcoded parameters
Update test for new geocoding
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