Add support for defer_geocoding
Merge branch 'master' of github.com:nedforce/devcms-geo