tiny docstring, import and trailing slash change
Merge pull request #1 from fonfon/master

Update to include several django-changes by Sunil and some url-changes by fonfon
Merge remote-tracking branch 'fbxat/master'