convert from janus to vundle
Merge branch 'switch-to-vundle'