Add Django 1.6 support.
Merge.
merge
Merge pull request #18 from dstegelman/feature/1.6

Add Django 1.6 support.