Add tombstone on MOVE

Resolves: https://www.pivotaltracker.com/story/show/82253464