More pyflakes fixes
Merge pull request #903 from jmaas/master

More pyflakes fixes