Merging vimrc
fixing