Wrapper cleanups
Merge branch 'master' of github.com:r-owen/twistedActor

Conflicts:
	python/twistedActor/deviceWrapper.py