scoping and reindenting
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358

Conflicts:
	src/main/webapp/client/nwc/general/services/SosSources.js
adding combination logic
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358
removing cruft
Merge pull request #103 from davidmsibley/WATERSMART-358

Watersmart 358