Removed submodules to use Vundle instead
Added back previous bundles, some new ones, ditched old ones