cleanup now occurs on whoever did the action
now undoes the action based on the user
Merge branch 'master' of http://github.com/noahpc/WhiteCollar