twofish
Merge branch 'master' of https://github.com/7h0m4s/Primate

Conflicts:
	twofish/__init__.pyc
	twofish/twofish.pyc
	twofish/twofish_cbc.pyc
	twofish/twofish_ecb.pyc
	vault.pyc