Add git merge-base alias
Vim rename substitution aliases
Add back split below