Ngwmn cleanups

Laura A DeCicco requested to merge ldecicco-USGS:ngwmn into master Mar 17, 2017