Update user_delete for #253.

This also takes care of the fact that this module had been patched in 61a2a6cf23c5
(but I apparently didn't move it to the patched directory)
Change content deletion strategy on user deletion for #253