Moved to Vundle

Did some additional cleanup as well.