Composite Annotator Creation in Factory

Moves composite annotator creation logic to the factory.  Based off of PR #198 .