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.
NetCDF_Gridded works for variable name, standard name or long name.
Fixed syntax for scatter plots in manual plot tests.
Added moments kernel and support for it in GeneralUngriddedColocator.
Updated syntax for subsetting to allow product= to be used. Also checks for syntax and fix to allow no keyword when there is only one optional argument. Subsetting documentation updated.
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.
Bug fix for colocation syntax parsing.
Merge branch 'devel' of proj.badc.rl.ac.uk:jasmin_cis into devel
Made time and time delta parsing more consistent, as for ISO 8061.
Merge branch 'devel' of proj.badc.rl.ac.uk:jasmin_cis into devel
Fix for test to expect te correct error.
Prevent units being displayed on the time axis.