Merge pull request #303 from sudorandom/master

Fix minor pep8 violations