Switch to a two-line-per-server table.

This breaks WAD files and the map onto their own row.