Merge pull request #99 from 6a6d74/json-edit

Updates to JSON mapping document (part 1)
Merge pull request #103 from 6a6d74/json-edit

JSON mapping document edits are now complete (I think)