Expanded testing of _.escape() and _.unescape() to cover all conditions
Merge branch 'negate'