Emacs config changed, small vim modifications