[MACS-Dev] new server checkins

[Blake M. <bl...@ba...>]

I'm going to start checking in the new server code, cvs builds will be 
broken for a while.