Make keybindings follow Emacs conventions better
Merge pull request #160 from david-christiansen/keybinding-compat

Make keybindings follow Emacs conventions better