Rework travis config slightly