cloud -> scicloud
Merge pull request #3 from benctamas/feat-scicloud

cloud -> scicloud
Merge pull request #2 from benctamas/master

toward c4
Merge branch 'master' of github.com:science-automation/scivm-worker

Conflicts:
	pimployee/setup_util.py