still trying to kill those stupid threads!
Merge remote-tracking branch 'origin/master'

Conflicts:
	ModMaster.py
	modules/TestModule.py
	robot.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Some more debugging.