Fix query counting tests for django 1.6.
Fix typo introduced in 7715bc7.

This was stopping kwargs from being passed correctly
to a superclass.
Add psycopg2 to django 1.6 test requirements.
Merge pull request #1 from meshy/feature/django_16

Fix query counting tests for django 1.6.