Update develop from master

[dahlbyk]

Includes #563 and an adjustment to #560 to accommodate ANSI prompt:

~ [PoshGitVcsPrompt error: oops]>$GitPromptSettings.Debug = $true
VERBOSE: PoshGitVcsPrompt error details:

PSMessageDetails      :
Exception             : System.Management.Automation.RuntimeException: oops
TargetObject          : oops
CategoryInfo          : OperationStopped: (oops:String) [], RuntimeException
FullyQualifiedErrorId : oops
ErrorDetails          :
InvocationInfo        : System.Management.Automation.InvocationInfo
ScriptStackTrace      : at <ScriptBlock>, C:\Dev\OSS\posh-git\src\GitPrompt.ps1: line 859
                        at <ScriptBlock>, C:\Dev\OSS\posh-git\src\GitPrompt.ps1: line 850
                        at Global:Write-VcsStatus, C:\Dev\OSS\posh-git\src\GitPrompt.ps1: line 850
                        at <ScriptBlock>, C:\Dev\OSS\posh-git\src\posh-git.psm1: line 76
                        at <ScriptBlock>, <No file>: line 1
PipelineIterationInfo : {}



~ [PoshGitVcsPrompt error: oops]> $GitPromptSettings.AnsiConsole = $false
~ [PoshGitVcsPrompt error: oops
VERBOSE: PoshGitVcsPrompt error details:

PSMessageDetails      :
Exception             : System.Management.Automation.RuntimeException: oops
TargetObject          : oops
CategoryInfo          : OperationStopped: (oops:String) [], RuntimeException
FullyQualifiedErrorId : oops
ErrorDetails          :
InvocationInfo        : System.Management.Automation.InvocationInfo
ScriptStackTrace      : at <ScriptBlock>, C:\Dev\OSS\posh-git\src\GitPrompt.ps1: line 859
                        at <ScriptBlock>, C:\Dev\OSS\posh-git\src\GitPrompt.ps1: line 850
                        at Global:Write-VcsStatus, C:\Dev\OSS\posh-git\src\GitPrompt.ps1: line 850
                        at <ScriptBlock>, C:\Dev\OSS\posh-git\src\posh-git.psm1: line 76
                        at <ScriptBlock>, <No file>: line 1
PipelineIterationInfo : {}



]>

[rkeithhill]

LGTM