updates to run in django 1.6