Reorganise the now-finally-working Travis config to be a little clearer