revert 3f95790
use vundle for the bulk of deps