Changed back to emacs bindings :)
Merge remote-tracking branch 'origin/osx' into linux