Fix imports to support django 1.6