have colormaps in black and white now
Merge branch 'master' of github.com:dmcdougall/scipy14-colormaps