State budget deal: 3% raise for state employees, faculty; 2% for teachers