Clean up dirty submodules
Re-add vim-dispatch (again..grr)