Real fix for 'resurrection' of deleted doc

A PUT, DELETE, PUT sequence should result in a rev with generation 3
that's a child of the tombstone revision.
This fixes #207 and is the real fix for #205.
Merge branch 'master' of /Couchbase/TouchDB into public-api