Merge pull request #106 from tuxinaut/master

Add git merge to the expanded numeric commands
Added git stash pop alias (gashp)
Added gmnff gmff alias for git merge --no-ff and --ff+