Adding django 1.7 compatibility