More robust handling of Travis timeouts