Fixed issues found preparing for FOSS4G NA
Merge pull request #9 from tkunicki-usgs/master

datastore fixes and more!