Django 1.6 updates

This gets everything working in Django 1.6 for me.