finished reconciliation of conflict between iterm integration script and custom prompt
finished reconciliation of conflict between iterm integration script and custom prompt

TimeDelta/dotfiles,TimeDelta/dotfiles,TimeDelta/dotfiles,TimeDelta/dotfiles,TimeDelta/dotfiles,TimeDelta/dotfiles