cleanup - left some junk in there
Merge branch 'newmodules' into SAYC
Updated to correspond to new treatment of cue bids