Major update to .vimrc