Keep a list of all definitions around, even if they are excluded/overwritten elsewhere
Subparts are part of the settings; they are also respected when generating the terms later. Fixed up some pluralization issues.
Follow PEP8 wrt imports
Term layer no longer includes any terms which are being defined in the same paragraph. This removes the need to look explicitly for quotes
Do not allow defined terms to appear /within/ a term we are currently defining
Merge pull request #73 from cmc333333/subparts

A few definitions fixes