Upgrade to latest core.match

The newer releases switch to using :guard to denote predicates inside a
match clause.
Merge pull request #635 from grimradical/upgrade-core.match

Upgrade to latest core.match