Django 1.6 compatible
Merge pull request #3 from MikeVL/master

Django 1.6 compatibility