Minor typo in delete tests
Use Django's built in `get_model` function rather than hitting the database

I don't even know why I was using ContentType in the first place!
Merge branch 'master' into deploy