Django 1.6

Get tests running on django 1.5 and 1.6 with python 2.7 and 3.3.