Small style fixes to match latest flake8
Merge pull request #240 from dstufft/update-flake8

Small style fixes to match latest flake8