Revert "Merge pull request #30 from eli-b/meta_with_text"

This reverts commit 666919e006c9d7682792ac537baa093f680ab72f, reversing
changes made to 4678ea2d839a495457dedf4fe0095c09e69b9f12.
Revert "Merge pull request #28 from eli-b/instrumentname"

This reverts commit a3822ac9cc54de8004dddfa33f883c9360277f51, reversing
changes made to 666919e006c9d7682792ac537baa093f680ab72f.

eli-b writes: "Now that the alternate implementation in my later pull
request for branch meta_with_text is accepted, this one is pointless.
The code added here isn't necessary anymore."
Revert "Revert "Merge pull request #30 from eli-b/meta_with_text""

This reverts commit 53d7bd9aff8049cdcd1fbd65ba45cbbad16f5990.

Ugh, git goof up.
documentation update
doc updates
Merge remote-tracking branch 'vishnubob/master'