added a test to see if there is running VM's to shutthem down
Merge branch 'master' of https://github.com/DemandCube/developer-setup

Conflicts:
	setup.sh