Fix up new travis handling