Merge pull request #172 from cschroed-usgs/WATERSMART-333

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