Checkout files after rebase with no conclict

We neglected to update the filesystem with the most recent version of the
files.
Remove needless variable bind
Fix from changing representation of removefile

Before: it was a changehunk and a removefile to delete a file
There was an incorrect pattern match on this so we updated to account for the
new representation: just a removefile.