Fix travis matrix for all combos