Watch values now escape special HTML chars in values and hash keys

This should fix rendering problems when a variable's value or keys has special
HTML chars like <

Uses the same kind of fix as commit 642b84