New function that highlights string.
Fixed template filtering.
Xzibit was here.
Another filter fix.
Some ReStyling
Merge remote-tracking branch 'origin/master'