v1.25 Allow -s and -h

If -s and -h are both given, silently ignore -h which is what psexec
seems to do (we think!)