issue #659 added colormap mode to DisplayDataOnImage
Merge branch 'master' of github.com:CellProfiler/CellProfiler