Supply merge.tool option when merging
Use `git mergetool` after error because `-c merge.tool` does not work
Merge branch 'powerline-release-merge' into develop
Force push to my fork of the overlay
Merge branch 'powerline-release-forcepush' into develop
Reorder pip arguments in installation documentation

`--editable`/`-e` pip argument is accepting an argument, not specifying the
action.
Merge branch 'replace-1151' into develop
CommandT has moved finders under CommandT::Finder module, respect this
Merge commit 'HEAD@{1}' into develop
Fix typo in capslock_indicator docstring
Merge commit 'HEAD@{1}' into develop
lib: Remove wrong shebang from debug.py.
Merge pull request #1208 from gladiac/shebang

lib: Remove wrong shebang from debug.py.
Only convert clementine title and album if they are true

It appears that at least album may be None.

Fixes #1207
Merge pull request #1210 from ZyX-I/fix-1207

Only convert clementine title and album if they are true
Add support for UCS-2 Python versions

Fixes #1213
Read the whole stream at once, not just 4096 characters

This may cause problems in case UTF-8 was read partially. Dunno how this code
survived in pyyaml.
Move some calculations into a separate function

Also moves non-printable character translation *before* width calculations which
is correct.
lint: Do not allow non-printable characters in configuration
Fix colors used in tmux left side

Fixes #1214