Fixed up some more ArcGIS generalization.
Merge pull request #45 from dblodgett-usgs/master

Final fix for ArcGIS integration.