Switch to inline trees and throwaway update commits
Include Marketplace in update zip
Don't reset if commit failed