adding WaterUseLookup, but still have to link it in
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-359
reworking waterBudgetServices in
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-359

Conflicts:
	src/main/webapp/client/nwc/general/services/SosSources.js
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-359
working on water use columns
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-359
in the middle of breaking apart sos parsing and cleaning
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-359
refactoring complete
Merge pull request #93 from dblodgett-usgs/master

Added descriptions for mag7 stats.
fixing ladder dependency and naming from carl review
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-359
just a comment
changing Water Use Chart to use all the columns
reformating per jordan
Merge pull request #92 from davidmsibley/WATERSMART-359

Watersmart 359
Removed free-floating text
switching to ascending sort
Merge pull request #95 from davidmsibley/WATERSMART-371

switching to ascending sort