Updated to latest vimrc