Merge settings with Posh-Hg because I'm tired of having dueling sets
Merge remote-tracking branch 'jaykul/master'
Fix Write-VcsStatus back the way it was.
Setting a DefaultForegroundColor
Ignoring IDEA files. Yeah? so what?
Catching up to upstream without directly using Keith's commits