Django 1.6 compatability fix
Merge pull request #22 from tekromancr/master

Django 1.6 compatability fix