Latest vimrc changes from work