updates to gitconfig from https://ochronus.com/git-tips-from-the-trenches/
use kdiff installed via chocolatey
always rebase (instead of merge) when pulling
layout changes