Add mexican province aliases
parse new names.txt format with extra flags
name overrides from 4sq SUs
Merge branch 'master' of github.com:foursquare/twofishes

Conflicts:
	data/custom/names.txt