Adding Django 1.6 support

Bumping the upper version of Django to include 1.6.

Adding a tox env to maintain support for Django 1.5 and fixing
env for django 1.4

Implements blueprint django-16-support

Change-Id: I093b38f85bea1fbd7641571a3871a721abadd37c