AGREEMENT AND PLAN OF MERGER DATED AS OF OCTOBER 31, 2004 BY AND AMONG VALERO L.P., RIVERWALK LOGISTICS, L.P., VALERO GP LLC, VLI SUB B LLC, KANEB PIPE LINE PARTNERS L.P. AND KANEB PIPE LINE COMPANY LLC