Reconcile the 2 Geonames classes

[tool/util/Geonames.java](https://github.com/sgsinclair/trombone/blob/master/src/main/java/org/voyanttools/trombone/tool/util/Geonames.java) is more recent but seemingly has less functionality

[tool/corpus/Geonames.java](https://github.com/sgsinclair/trombone/blob/master/src/main/java/org/voyanttools/trombone/tool/corpus/Geonames.java) is less recent