getting django 1.5 updates url and future
Merge pull request #122 from dimagi/django-1.5

getting django 1.5 updates url and future