reorganized some things in vimrc