Merge upstream changes to minimize diff when pushing recent changes back upstream

I figure it will be easier to discuss changes when pushing to rwcarlsen if we first pull in the work that has been committed to that repository since camlistore last sync'd.  

I'm confused regarding the use of the upstream vs go1 branch.  I hope this is the right branch.