Add ** to match until in addons

[pfultz2]

Doing match(tok, "**;") will match until the semicolon.

This also fixes the incorrect slicing for !! match as well.