Modify git aliases
Merge branch 'master' of github.com:emosher/dotfiles
Changed git aliases, don't like the last version