InTextAnnotationParser to use composition

- Partial revert of the 303 revert
- Add MagicWordFinder
- Add RedirectTargetFinder
Merge pull request #410 from SemanticMediaWiki/intext-anno-parser

InTextAnnotationParser to use composition