[gitconfig] color config and better aliases
Merge branch 'master' into work