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

Remove code for pre-cryptography 1.2