A bunch(!) of changes, mostly to vimrc.