Better handling of timeouts for Travis