Merge pull request #36 from oreillymedia/sarah

fixed handling of ulinks with text nodes
added handling for @role attributes on ulinks