Catch more definitions
Use the *first* def rather than the last, when a term is being defined
Account for scope that's limited to a particular citation
PEP8
Merge pull request #170 from cmc333333/additional-defs

Tweaks to definitions