Make C-w closer to emacs

Fixes #612