Simplify the Travis matrix