Mayor, City Council reach budget deal