Updated vim configuration
Merging changes