removed Soar 7 stuff as per csoar r13602

* mostly reconsider preference stuff
* also some comment updates
continuing to work through CDPS diff
Merge branch 'master' into maven