Upgrade to proj4 2.2