Now that TokeSpans are not automatically added to the Document, 
make Mention be a TokenSpan, not contain a TokenSpan
(as recently discussed with Alex).