Cask updates
Fixup conflicts
Submodule updates