Disable travis failure on timeout

Conflicts:
	.travis.yml