Add merge summary and colors to gitconfig
Add function to sync dotfiles quickly between branches