Improve handling of Konica Minolta cameras

A further refinement of the Konica Minolta name munging to catch at least one more corner case (the DiMAGE A2 was munged to "Konica DiMAGE A2" and that doesn't match the coefficients that are under "Minolta DiMAGE A2"). I also added coefficients for the DiMAGE 7i taken from the DNG conversion. Before, because of the partial matching, it was using the DiMAGE 7 coefficients that are a bit different.