code cleanup
Merge branch 'master' of https://github.com/socec/crypto_pki

Conflicts:
	pki.py