Add stash aliases and change some branch/merge settings
Add bin dir and git-reup command