Removed redundant method.
Work in progress for colocation reorganisation.
Completed work for colocation with k-D tree optimisation of separation constraint with gridded data.
Merge remote-tracking branch 'origin/devel' into colocationreorg

Conflicts:
	jasmin_cis/aggregation/aggregator.py
Changed to simplified colocation syntax - JASCIS-52.
Merge remote-tracking branch 'origin/devel' into colocationreorg

Conflicts:
	jasmin_cis/aggregation/aggregator.py
Further fix related to that for Trac #404 in bcebe3c7..: For nn and li colocation of gridded data to ungridded sample points, omit sample point coordinates that are not dimension coordinates of the grid.
Added moments kernel and support for it in GeneralUngriddedColocator.
Removed DefaultColocator, AverageColocator, DifferenceColocator and DebugColocator: first two replaced by GeneralUngriddedColocator; others no longer suported. Removed full_average kernel, replaced by moments kernel. Added alias classes for nn_* kernels. Made DummyColocator usable for ungridded to ungridded colocation.
Merge branch 'devel' of proj.badc.rl.ac.uk:jasmin_cis into colocationreorg
Updates to, and as a result of running, units tests for colocation.
Merge branch 'devel' of proj.badc.rl.ac.uk:jasmin_cis into devel