Cleanup travis test matrix