Updates to aggregation to get aggregation grid correct for time, and to subset the data before aggregating with Iris so that extra that is outside the grid is not included.
Merge branch 'devel' of proj.badc.rl.ac.uk:jasmin_cis into devel