fix some bugs

remove shift/reduce conflicts

edits

edits2
Merge branch 'master' of ssh://github.com/Cphilo/tpyc