Fix #494
Fix #489
Merge branch 'fix-git-errors' into develop
Merge branch 'develop' of https://github.com/Lokaltog/powerline into develop
a