Update escape.groovy

don't escape $ since the rules on escaping that are pretty fuzzy
Update sorty.groovy

* 4.1 compatibility fix
Merge branch 'origin/devel'