Update tpm and rename to 3pm
Merge branch 'master' of https://github.com/three-x/3pm

Conflicts:
	3pm.py