Updated v3 patches for notmuch restore --accumulate.

[David Bremner]

These are rebased quite violently from what Thomas posted.  They are
also the first use of getopt (because I plan to add another option to
restore). They depend on id:"1319199557-16888-1-git-send-email-david at 
tethera.net".