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

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