Package cleanup.

Laura A DeCicco requested to merge ldecicco-USGS:master into master Jun 12, 2015