Add git aliases
Merge branch 'master' of github.com:dfujiwara/dot_files