Workaround for Google sublocality bug

Handles https://code.google.com/p/gmaps-api-issues/issues/detail?id=3320
Google's Geocoder will sometimes return a blank locality and a populated sublocality.
This is common for NY city addresses.

This fix will use sublocality for city is locality is blank, and allow locality to overwrite city if the return has both.