PEP8: fix spaces
BF: check Colorbar instance on the object istself, not object[0]
Merge branch 'master' into _bf/test_viz
Merge branch '_bf/test_viz' of https://github.com/nno/PyMVPA

* '_bf/test_viz' of https://github.com/nno/PyMVPA:
  BF: check Colorbar instance on the object istself, not object[0]
  PEP8: fix spaces
BF: resolving failed matshow smoke test by allowing both types of return value (tuple and the instance) for the ax.colorbar