Merge branch 'master' into WATERSMART-198
Deduplicating code.
Merge branch 'master' into WATERSMART-198
Merge pull request #32 from cschroed-usgs/WATERSMART-198

Watersmart 198