Use master branch on submodule
Use 'patience' diff algorithm; Add some aliases