Merge pull request #91 from oreillymedia/sarah

Handling to preserve @id attributes on table entries
Adjusting handling for entrytbl so that it gets nested in a td