Further travis config refactoring