merges in ssh-agent simplifications from cygwin branch