Upgraded to work with Django 1.6 and django-bakery 0.3.0. Fixes #119 and #122.