Add Disambiguation nodes. Demo -> Gewgaw. (It will get worse before it gets better.)

--HG--
rename : data/original-demos.yaml => data/original-gewgaws.yaml