Improve support for multi-line shell prompts in shell integration
Merge branch 'master' of https://github.com/gnachman/iTerm2