fix default mode in zsh bindings
Merge pull request #855 from afflux/feature/fix-zsh-mode-display

fix default mode display in zsh bindings
Decode bytes before using os.path.join

Otherwise it will raise TypeError when trying to join str() and bytes() instance 
in python-3.3.

Fixes #654
Closes #655
Do not use .strip(), add two check git has
Merge branch 'fix-git_directory' into HEAD
tmux: Change session block color if prefix pressed

This modification to the tmux powerline binding allows the user to
easily identify when the prefix has been sent. When the prefix has
been sent, the session block changes from white to blue (matching the
color of the active window). This is accomplished using the conditional
functionality of tmux format strings and the 'client_prefix' format
variable. Unfortunately, the tmux parser fails to properly parse out
comma-separated format strings inside a format conditional, so those
have been split out into individual segments as well. Attempting to
re-combine the formats inside the conditionals will break this feature.
Merge remote-tracking branch 'remotes/lokaltog/develop' into develop
Merge branch 'feature/tmux-indicate-prefix' into develop