cleaning up loose ends

Wald, Lisa A. requested to merge github/fork/lisa-usgs/cleanup-apr28 into master Apr 29, 2016