Move to Vundle
Clean up