revisision tracking patches round 3

[David Bremner]

Ironically there is some uncertainty about what revision this is
due to confusing cover letters for previous rounds.

This obsoletes

     id:1433525318-23756-1-git-send-email-david at tethera.net

I think I've taken into account most (all?) of Tomi and Daniel's
comments. There was a fair amount of rebasing silliness so I thought
I'd get some more eyes on this to check for typos and bikeshed the
naming of the --uuid option.