Added django 1.6 support