tidy up a bit
change ssh-agent for use without keychain