minor
Merge branch 'master' of https://github.com/doughague/torpy

Conflicts:
	src/lib/Warrior.cxx