Merge settings with Posh-Git because I'm tired of having dueling sets