Adds git-merge-master and git-current-branch
Fixes variable leak