Switch over to Vundle
Cleanup