Merge pull request #1383 from maxking/master

Add license to cryptography_vectors tarball; solves #1377
Merge pull request #1403 from reaperhulk/backport-license

backport license fix to 0.6.x