PEP8 fixes
Merge pull request #31 from chadlung/master

PEP8 fixes