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

Fixed several flake8 errors