massive update to project to meet django==1.6 requirements