Refactor delete modals

The first commit refactors delete modal to be compatible with canjs-2.0 branch (it works both with and without canjs-2.0 so it's safe to merge into develop).

The other commits are fixes for story: https://www.pivotaltracker.com/story/show/59848484