Roxygen and bug fixes

Laura A DeCicco requested to merge ldecicco-USGS:master into master Dec 02, 2015