fix Colorado, US cities

Fixes #2
fix Mexico cities in states Guerrero and Hidalgo (solves half of #3)