clean up test runners
Merge branch 'master' into sauce

Conflicts:
	.travis.yml