Change a few key bindings
Merge branch 'master' into js_ide