Upgrade to django 1.6
fixup! Upgrade to django 1.6