University, faculty reach tentative agreement