updates to match master pull request

will make geonames goodness available to the world!