Added virtualenv to setup.py tests_require
Merge remote-tracking branch 'origin/django-1.6' into django-1.6