Further streamline nearest-neighbour calculation #559

The core code in ‎Regridder.regrid combines the area-weighted and nearest-neighbour options,
but I think that the common code is doing unnecessary work in the nearest-neighbour case.

See comments here

This will make sense when #558 is merged