Bind pkcs12. Refs #77 -- blocked by the x509 work
Merge branch 'master' into bind-pkcs12

Conflicts:
	cryptography/bindings/openssl/api.py
Merge pull request #132 from alex/bind-pkcs12

Bind pkcs12. Refs #77