Thanks @suweller!
Cleanup and new vundles