Remove name parameter to add support for Django v1.3
Fix broken test.
PEP8
Merge branch 'django-v1.3'