Update to django 1.6.

django.contrib.markup is no longer supported.