Pull the GeoIP changes from Bouke into this fork from the heroku master;