Reorganize travis test script, I *think* no functional changes