Custom key-bindings for evil-matchit

Also remove confict with ace-jump on `,`