Switch vundle to neobundle & clean up some packages