Merge pull request #64 from reaperhulk/travis-test-cryptography-master

Test against cryptography's master branch