Add missing pieces from old .vimrc