more doc cleanup
fix merge conflict
more core doc
merge
more doc for arcgis parser and core, fix TOC with headers that are methods
remove merge conflit on geostore
Merge branch 'master' of github.com:Esri/Terraformer
make arcgis parser docs look like geostore docs
Merge pull request #198 from nikolaswise/master

merge fix
fix merge conflict
Merge pull request #197 from patrickarlt/master

More doc merging and fixes
glossary
Merge pull request #200 from patrickarlt/master

glossary
mergefix