Updated to django 1.7