initial work for django1.6; tests are passing