Allow text-provider to be something other than "annotation" if it's set.
Merge pull request #470 from dsallen/topic-custom-annotation

Allow text-provider to be something other than "annotation" if it's set.