Moved from submodules to vundle; Clean up