2nd step in merging all my vimrc