fixed conversions between similar types

for example 'kWh' and 'kilowatt hour *', which it wasn't recognizing as
the same thing.