PEP8 fixes
Merge pull request #1 from ryansb/master

PEP8 Fixes