Fix soft_delete bugs and update one buddy test
Merge pull request #55 from zendesk/pobrien/soft_delete

Fix soft_delete bugs and update one buddy test