set options
Merge branch 'master' of github.com:cloudmesh/cloudmesh

Conflicts:
	setup.py