reorganizing
derp, tests all good now.
Merge pull request #13 from dblodgett-usgs/master

Got tests fixed up and did some reorganization.