PEP8
PEP8 another one
DOC: fix syntax error
DOCTEST: fix
Merge pull request #782 from sciunto/pep8

PEP8 + docstrings