updates for running against django 1.7.