Updated emacs config and vimrc