minor reorder
fixed CMYK to RGBX
simplified RGBX to CMYK
more conversions from RGB
added conversion tests