improve cloudcontrol setup
Merge branch 'master' into rkh-cancel-build

Conflicts:
	README.md
	travis.gemspec