Adding $ to units
Fixing unit test
Merge branch 'MeasureImprovements' of github.com:NREL/OpenStudio into MeasureImprovements