I think I have it finally figured out. It was an assortment of things. Cleaned the EGR valve, IAC, FITV (and adjusted), and Throttle Body. Finally got rid of the rolling idle. Now I need to get it to idle down. Wants to Idle about 1200 RPM. It has an idle adjustment though.
Now on to the secondary issue with the car. When it has less than half a tank, as I slow to a stop it has a tendency to stall. I am thinking that the fuel pump is bypassing internally or the rubber line on the top of the pump has a small leak in it. Either way I think this weekend I will be pulling the tank to replace both pieces.