Dusted these off to work with recent changes for pigment bleaching.  Mostly printout fixes.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>