Quick add/remove parens around function args.
Adjust regex matching regex in syntax definition.

Yo, dawg.

[Fixes #165]
Merge pull request #167 from markalfred/master

Quick add/remove parens around function args.
Merge pull request #168 from markalfred/mb/regex

Adjust regex matching regex in syntax definition.
Merge remote-tracking branch 'upstream/master'