Minor vim/emacs modifications