updating vimrc, reorganizing