Clean up and switch to Vundle