fix TS/8: VarRefs were not renamed when desugaring Or with overlapping Vars

http://yellowgrass.org/issue/TS/8
fix TS/7: support 'trm has attr x' patterns where trm is not a VarRef
fix TS/9: $ escape in template was not handled in translation
generated files
test cases for bugs
Merge branch 'master' into unstable