merged my previous vimrc