Modeling dependent country relationships

Supporting queries like "Macau, China" which wouldn't work until this point because Macau has its own country code and doesn't directly related to China in the geonames hierarchy. This prevented Macau, China from being considered a valid parse.
Stop ignoring .txt files