switch vundle to neobundle
fix conflict