More Travis config changes to matrix.