minor documentation fixes
fix pep8
Merge pull request #2753 from catlee/docs

Minor documentation/pep8 fixes. Fixes #2753.