units_convert and conventions
Fixes the unicode issue with unit conversion
Adds test to verify temporal unit conversions are correct
Merge remote-tracking branch 'upstream/master'