Update submodules
Add git merge and diff tool alias