And then 'cancel job' was born
Merge branch 'master' of https://github.com/travis-ci/travis-worker
Merge branch 'master' into fix_tests

Conflicts:
	lib/travis/worker/instance.rb