Stop using our fork of GMap and use new 6.x-2.0 branch