Fixed PEP8 issues in source and in the docs
Merged from master
Fixed some more PEP8 issues