ssh-copy-id now supports ssh options.