Package overhaul
Merge pull request #3 from tmills-usgs/master

Package overhaul