Merge pull request #55 from reaperhulk/parameterize-encrypt-changes

Changes to parameterize_encrypt_test to support other NIST vectors