Fixes for combos.

Treat everything as combo.. simpler code. (may be slower)

Fix regex to pass "+" as part of name for splitting later. It's expected as it splits by it later.

Only trigger once if matched, calling the first matching key combination... so "tab+shift,tab" will match 'tab+shift' in preference to 'tab' and only be called once.