final update for new roxygen
Merge branch 'master' of https://github.com/USGS-R/USGSwsBase