changed some git aliases
Merge branch 'master' of github.com:tswift242/dotfiles