Repair previous fix

Yet another escape collision, woops
Add contains_text overrides to list contains

This required adding attribute.matches rather than startsWith to dodge
trouble.
Also, fix some meta.
Merge pull request #852 from mcmonkey4eva/master

Pull request for major fixes