Fixed minor doc errors and did a little PEP8 cleanup
Merge pull request #446 from yosinski/master

Fixed minor doc errors and did a little PEP8 cleanup