merging in @cgzones geoip clean
Merge pull request #56 from jrossi/cgzones-geoip-cleanup

Cherry-picking in @cgzones geoip clean