Fix latest psutil breaking network segment
Fix #604
Merge remote-tracking branch 'kovidgoyal/fix-unicode-in-setup' into develop
Merge remote-tracking branch 'kovidgoyal/fix-latest-psutil-network' into develop
Merge branch 'develop' of git://github.com/Lokaltog/powerline into develop