Firefighters and City Come to Terms on Contract