Almost done with parsing rules.  Updated some of earlier documentation with new form.
Fixed merge conflicts in doc.txt using jcbs version