scoping and reindenting
reformating per jordan
Merge pull request #92 from davidmsibley/WATERSMART-359

Watersmart 359
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358