Upgraded everything to work with Django 1.4.5