Fix some pep8 issues and some docstrings
Merge pull request #36 from holdenk/fix-pep8-issues-on-master

Fix some pep8 issues and some docstrings