hopefully, make restore-instance work a bit better

all our backups are now partitions, so default to that rather than disks.
Merge branch 'master' of github.com:richvdh/amazon-tools