AMENDED AND RESTATED AGREEMENT AND PLAN OF MERGER by and among O’NEILL ACQUISITION CO. LLC, O’NEILL ACQUISITION CORP., JEFFREY B. O’NEILL and GOLDEN STATE VINTNERS, INC. Dated as of March 23, 2004