Add experimental raw CMYK support.
Include code for CMYK (oops)
Merge remote-tracking branch 'origin/CMYK' into cmyk-merge-test

Conflicts:
	diagrams-postscript.cabal