Update src/pm.py
Merge branch 'master' of https://github.com/kevinmisc/pm

Conflicts:
	pm.py
update