Upgrade to django 1.6