hackety hack
Merge remote-tracking branch 'origin/master' into colour

Conflicts:
	TODO
	libvips/colour/colour.c
Merge remote-tracking branch 'origin/master' into colour
Merge remote-tracking branch 'origin/master' into colour
Merge remote-tracking branch 'origin/master' into colour
Merge remote-tracking branch 'origin/master' into colour
get colour.c compiling

does cast and band ops as well
Merge remote-tracking branch 'origin/master' into colour
Merge remote-tracking branch 'origin/7.28'

Conflicts:
	ChangeLog
	configure.in
	libvips/deprecated/im_csv2vips.c
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog
	configure.in
Merge remote-tracking branch 'origin/7.30'
Merge remote-tracking branch 'origin/7.30'
Merge remote-tracking branch 'origin/7.30'
revert gtk-doc change
Merge remote-tracking branch 'origin/7.30'
Merge remote-tracking branch 'origin/master' into colour
hackety hack

make a base class for colorimetric operations
sync
Merge remote-tracking branch 'origin/7.30'
Merge remote-tracking branch 'origin/master' into colour

Conflicts:
	ChangeLog
	TODO
	configure.in