TECH: updates to be allow merging of content from multiple annotations into a single document.
Merge branch 'master' of github.com:ebuddy/jsondoc