Finally upgraded to #django 1.8. Only an 8 commit adventure