Making a bunch of the install steps idempotent