merge in tools

merge in esri2gist and esri2couch