New, simplified travis config