add django 1.6 test runner
fix merge conflicts