upgraded to django 1.6 and then forgot to merge branches before working on other stuff.