Remove ultisnips
Various submodule tweaks