Update my .vimrc
merge