Use emacs key-bindings
Merge branch 'master' into magine