removing pep8 violations on 2.0 branch
Merge pull request #30 from lowks/2.0

Thanks!