Reorganize travis test script, should be no functional changes