Remove GeoIP-related options. Where possible, replace GeoIP 1 defaults with GeoIP 2. Also, as suggested by zi, add an UPDATING note about this.