Take ESMF out of build again; now only tests regrid_conservative when ESMPy installed.
Small changes on review.