updated for linux version
trying to fix conflicts
Merge branch 'master' of https://github.com/sharkvfx/pipewrench

Conflicts:
	deliveryRobot/createTestDir.sh