Updated CUP with some shift/reduce errors

Integrated my conyo.cup edit with conyo_edit.cup (JP's version)