Bump Match

* Fix tests
* add `@ismatch` macro
* Misc fixes/updates