Fix some flake8 nits.
Merge pull request #259 from graydon/misc-flake8-fixes

Fix some flake8 nits.