update vimrc and orgainze sets together
merge origin/master