Actually implement point #1 from the previous commit
Actually implement point #1 from the previous commit

Retains the old behaviour if keys without modifier are used.

seanpringle/simpleswitcher,seanpringle/simpleswitcher