redefine one2

one2 has semantic meaning, so i redefined it
like all the other predicates
plurals represented by Set objects
Merge branch 'master' of https://github.com/fredcallaway/hci