Merge pull request #1 from USGCRP/master

bring branch up to date
Merge pull request #25 from rewolfe/master

Merge pull request #1 from USGCRP/master