Merge remote-tracking branch 'gh-master/master'
DOC: Added a demo script for SKLTransformer wrapper.
DOC: Added a demo for SKLTransformer
RM: removed doc/skl_transformer_demo.py
Merge branch 'skldoc' of github.com:neurosbh/PyMVPA into neurosbh-skldoc

* 'skldoc' of github.com:neurosbh/PyMVPA:
  RM: removed doc/skl_transformer_demo.py
  DOC: Added a demo for SKLTransformer
  DOC: Added a demo script for SKLTransformer wrapper.
DOC: Slight polish; list on website
PY3+BF: ensure that mixed type bytearray is converted to string
RF+ENH+PY3: use "with" statement when opening file
RF: use assertEqual instead of failUnless
PY3: change expected type of error depending on python version.
PEP8: minor formatting
Merge pull request #194 from nno/_tent/py3k

Py3k-related improvements
Merge branch 'neurosbh-skldoc' of https://github.com/hanke/PyMVPA

* 'neurosbh-skldoc' of https://github.com/hanke/PyMVPA:
  DOC: Slight polish; list on website
  RM: removed doc/skl_transformer_demo.py
  DOC: Added a demo for SKLTransformer
  DOC: Added a demo script for SKLTransformer wrapper.
scikit-learn example: header, x permission + fix for skl_data rename