moved some git aliases into .gitconfig file
Merge branch 'master' of github.com:ejwaibel/dotfiles