Add git up alias
Add setting to rebase when pulling
Enable rerere setting
Add git init template directory
Reorder settings
Reorder aliases
Update color settings
Alphabetize settings