Changes that I think make the psexec mixin better

Merge with latest rapid7/master to make all the unrelated commits go away in this PR.