extend to include non-standard :contains('text') pseudo-classifier.
Added :contains and fixed some other stuff
Merge branch 'GistLabs-master'