Fixes caused by improper merging.
Adding a undo delete button back to the ProblemSet Details view.
General cleanup of post-merged files.