django 1.6 --> 1.7 upgrade