Merge branch 'master' into bluebox-production-org

Conflicts:
	Gemfile.lock
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Fix error message for Sauce Labs VM boot errors
Update travis-build
Update the boot sequence for Sauce Labs VMs
update travis-build
Merge branch 'bluebox-production-org' of github.com:travis-ci/travis-worker into bluebox-production-org
update travis-build
update travis-build for rbx changes
update travis-build
revert support
Merge branch 'master' into bluebox-production-com

Conflicts:
	Gemfile.lock