Merge .vimrc from work
Minor changes