University and CityBus arrive at one-year deal, after bus company balks at continuing free rides off campus for students, staff, faculty for coming school year.