Gonna put some wheels in motion, get ready 'cause we're coming through

I just finished watching the XO/RPM FUDCon video, and here are my thoughts, in no particular order:

• Packaging activities as rpms is a lost cause; there are almost none important enough to require root capabilities to install. Package known-good versions of Browse and Terminal with Sugar, and move on.
• Activities are exactly like DVCS repos:
• The master is the versions of the activity from upstream. 1.0, 1.1, 2.0, etc. All versions would be contained within it.
• User-modified versions are branches, each based on a specific version; Kim's is a UI hack based on 1.0, while Miguel's adds additional transports and is based off of 1.1.
• Branches are separate from the trunk; both the trunk and each of the branches can be moved around independently, and the branches depend on the trunk in order to function properly. It will be the job of rainbow or whatnot to reintegrate the activity so that it can be run.
• The icon on the Activity view is the normal icon for the activity, and represents the latest version of the master. It can be right-clicked to either rebase the existing activity to a user branch (or the master as the case may be), or add another icon representing the user branch. User branches would be indicated with the homunculus of the creator as an emblem.
• Activities can still be stored in a central place, perhaps mediated by an "Activity Manager" daemon or process.

Comments and criticism welcome.