Subtract length of family + model from matches

1. Break ties in match value between candidate products by encouraging
the shorter family+model product to be chosen. Do this by subtracting
family+model from the value function.
2. Update unit tests.