Spring cleaning and Vundle integration