ENH: more pep8 compliance
Merge pull request #29 from dnmiller/more-pep8

ENH: full pep8 compliance