Fix to handle options provided, moved password field to options

Fixed to handle other ssh ‘options’ provided. Moved the password field
in to ‘options’
Update to handle new method signature