vimrc and bbye plugin
Merge branch 'new_origin'