update to consistent naming scheme and functionality
code tweaks and more moved from USGSwsBase
Merge pull request #3 from dlorenz-usgs/master

Getting Dave's latest stuff.