Fixed a some minor bugs, and 1 major one.

Now works with Django 1.5 as well as earlier versions