Handle multiple cities in country with same name
Fix travis config to install desired Django
Merge pull request #43 from dpoirier/duplicate-city-names

Load cities from different regions
Version bump 2.2.12
Django 1.7 requires south2 which isn't out yet
Merge branch 'master' into chinese
Simplify fields editable in the admin.