Merge pull request #13 from ndw/xproc20

Replace general entities with XInclude