grayscale matrix issue resolved

Signed-off-by: jayrambhia <jayrambhia777@gmail.com>
slight mods to tests
Merge branch 'develop' of https://github.com/sightmachine/SimpleCV into develop
Merge branch 'Image/cvmat_con1' of github.com:jayrambhia/SimpleCV into develop