New and improved vimrc