Merge pull request #326 from pyca/alex-patch-1

flake8 fixes