Merge pull request #3 from dblodgett-usgs/master

Removing git goofyness.
Let's try this again.