changing launcher config
Merge branch 'master' of github.com:cloudmesh/cloudmesh

Conflicts:
	etc/cloudmesh_launcher.yaml
fixing the conflict (done by gregor)