pb-python uses pound-python, language=python
rename diffconflicts -> vimmerge
configure hg
Merge branch 'work'

Conflicts:
	bin/pb-python