Speed ups and whatnots

Laura A DeCicco requested to merge ldecicco-USGS:master into master May 05, 2017