Temp revert django 1.6 upgrade

This reverts commits:
8ff55ce49687e064e9c80ee6a639c2cffc1394ca
907d466101b1b4fb881b6bd8455c1bce34de3f56