Saw these cool photos of what will become of Cantina de SAn Angel this Fall
It'll be called Hacienda de San Angel, and there will be some great indoor and outdoor dining areas. I guess it's supposed to be part table service and part counter service. Looks cool:
http://www.disneyfoodblog.com/2010/05/21/hacienda-de-san-angel-photos-and-updates/