Merged city/country fields in cities.csv and updated scripts accordingly.