New agreement increases wages for Miami firefighters and police