Update powerline for new psutil

Fixes #835
Switch comments
Fix tests for new psutil
Merge pull request #838 from ZyX-I/new-psutil-fixes

New psutil fixes