Merge pull request #21 from Brant/master

support for django 1.6
v0.3.0