Merge changes from work vimrc