Fix presence of town/city in town names.
Merge branch 'town_county_data'