Tweaks to terms layer

* Catch `(1) <E>Term1</E> or <E>Term2</E> means...` definitions
* Account for when one of the terms *contains* another
* Make sure we're grabbing words (rather than citations) using the scope_term_type parser