fix travis build
Merge branch 'fix/travis-build' of https://github.com/cgcgbcbc/CloudComputing into cgcgbcbc-fix/travis-build

Conflicts:
	lib/tasks/travis-ci.rake