Fixed README path in setup.py
Merge branch 'django-1.4'