Merge pull request #168 from dschmitt-usgs/master

WaterSmart-404