Thanks Jim for the easiest solution to the problem. I rotated the crank a bit, and that allowed me to move the cam to the proper position. After installing the tensioner I rotated the crank manually through the whole cycle a couple of times to ensure everything was set properly, and all was good.

I fired up the car for the first time last night. All seems very good. I had a lifter that was slow on getting pumped up, but it quieted down after 2-3 minutes. I'm giving the cooling system several flushes to make sure all the oily deposits are out then I'll change the hoses, and fill it up with MB coolant.

Thanks again for everyone's replies. I hope not to have to do that job again for a long time.

--Dean