Django 1.6 compatibility
Merge pull request #11 from joshowen/master

Django 1.6 compatibility