updated and reorganized vimrc