Fixes for Django 1.6
Merge pull request #1 from Nuevosmedios/django16

Fixes for Django 1.6