Add git merge-base alias
Update submodules (mostly for Hack)