Complete rewrite of my vimrc