This merges a *different* repository into this one, in order to unify
the development of the two repositories.
Additionally, the subdirectories 'SMOR' in one, and 'treetagger' in the
other repository were deleted prior to this merge.