reverting back a few commits, with additional cleanups
refactoring
input term deduplication, and other updates
prevents CompoundTerm makeName name if variables were not renamed
updates
Merge remote-tracking branch 'origin/master'