changes for latest hacking/flake8
Merge pull request #43 from dougwig/recent_flake8_fixes

changes for latest hacking/flake8