Added ability to choose which geonames city db to use