Support for django 1.6
Merge pull request #123 from redhog/master

Support for django 1.6