about to pull
merged .vimrc