Support for psutil 2.0

@saimn - this includes your commit