Also update for changes to how models are created, various other changes.

cleanup error handling for Apple Pay
Use dispatch_groups to ensure the shop and checkout are completed before continuing with an Apple Pay checkout

Minor improvements to the logic in the sample app for handling a SFSafariViewController checkout and returning from a successful checkout using the urlScheme button