Progress towards making things work on Travis again