Lunchtime hackfest part 2: Re-order & cleanup geoip.