Fix bad right prompt placing.
Fixes tmuxinator plugin find on OSX
Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find

Fixes tmuxinator plugin `find` on OSX
Merge pull request #2389 from driver2000/patch-1

Fix bad right prompt placing.
Fixing iTerm Tmux integration (branch off upstream/master)
Merge branch 'iterm-tmux-pr'

Conflicts:
	plugins/tmux/tmux.plugin.zsh