update travis-build
Merge branch 'master' of github.com:travis-ci/travis-worker

Conflicts:
	Gemfile.lock