Updated vimrc file
Merged changes to vimrc file