Update vimrc

merged changes from work vimrc