Added support for PsExec v2.0, fixed spacing, and resolve merge conflicts.