Conversions: Refactoring to clean up hacks around units
Also fixed bug with Kelvin as a unit (there is no degrees Kelvin, just Kelvin)