BF: fix to handling of greyscale images being presented in ImageStim

these were not being identified correctly as needing conversion to RGB images
and rendered very badly
Merge branch 'master' of github.com:psychopy/psychopy
BF: Minor improvement to error message when a numeric color is given but colorspace is 'named'