local changes
MergeMerge branch 'master' of github.com:mikehulluk/python-devtools

Conflicts:
	src/pdt/pdtmain.py
...