Fix merge conflicts
Merge pull request #434 from polyfractal/hatchetation-object_readability

Fix a few typos and small copy edits on object type doc