Add test for 'initials' predicate
Add test for 'ngrams' predicates
Add test for block_training
Add test for predicateType
Add more test for blockTraining
Add test for Simple Predicate and Canopy Overlap
Fix bug in Canopy Overlap test and add simple test for InvertIndex
handled conflicts
pull in nikit's tests