Minor code simplification
psutil works on all major platforms, so no need to limit it.
Combine two test configurations.
Install psutil on Travis