fix env vars and startup script
Merge branch 'master' of github.com:science-automation/scivm-worker

Conflicts:
	pimployee/setup_util.py