vim: Switch bundles back to upstream project

I forked, updated, and submitted pull request on a couple projects.
Those have been accepted by upstream so switching back to using those.