Continue migration to new vimrc