Add a couple comments to deactivate-final-rename
Rename deactivate-final-rename to cancel

Fits my brain better. Anyone else?
Actually, rename cancel to deactivate

Let's say that "deactivate" is a step in the "cancel" process.
Merge pull request #2370 from gittip/cancel-tweaks

Cancel tweaks