Providing options.privateKey means no password is required

Previously, a password prompt showed up if you did not provide a password on options.password, whether or not you provided a privateKey. There should not be a password prompt if a password OR a privateKey is provided.