Reorder color.diff config
Remove git br alias
Merge pull request #9 from ryansobol/master

Improve git config for class 3 and 4