Refactored aggregation so that it can be unit tested properly, and is easier to extend to ungridded data.
Merge branch 'devel' of proj.badc.rl.ac.uk:jasmin_cis into devel