Add map_instance_id option
Add ssh_options
Merge branch 'ssh_options'