Work vimrc commit
Fixed up merging vimrc