WATERSMART-364
* changed imperial to usCustomary in conversion util
* changed uses of conversion to use usCustomary
* changed text on button to US Customary
WATERSMART-364
* fixed broken test, thanks Sibley
Merge pull request #98 from jiwalker-usgs/WATERSMART-364

WATERSMART-364