Merge pull request #29 from cschroed-usgs/WATERSMART-263

Watersmart 263
Messy merge of streamflow stats branch.
Merge branch 'master' of github.com:cschroed-usgs/nwc