Updated submodules; changed some unison settings