Fix some pyflakes warnings
Merge pull request #82 from asmeurer/pyflakes

Fix some pyflakes warnings