better version
Merge branch 'master' of https://github.com/brentp/toolshed

Conflicts:
	setup.py