Refined .vimrc
Merge .vimrc changes with MASTER