updating git aliases

p r o g r e s s
Merge branch 'master' of github.com:jtprince/dotfiles

merging