Keymap update
Merge branch 'master' of https://github.com/ihercowitz/E4C