fixed escaping; name vars more consistently.
Merge branch 'master' into gh-pages