
	I made the findAnnotator method load annotators that have been
	encapsulated regardless of their names (previously they were
	required to end in ".ann".  To do this I reorganized the logic
	of the method to more accurately perfom the logic shown in the
	javadocs.  Also, I added a helper method to find a savedAnnotator
	using an object stream.  Previously this logic was in the
	findMixupAnnotatorFromStream method with a special case when the
	source ended in ".ann"


TeamCohen/MinorThird,TeamCohen/MinorThird,TeamCohen/MinorThird,TeamCohen/MinorThird,TeamCohen/MinorThird