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

Submitting a similar set to posh-git -- could probably go further than this to integrate them, but this is enough for step one