Added data value mappings for certain blocks and made all other block types wildcard matches.
Moved containsFuzzy from EditSession to BaseBlock.
odd manual merge. Again.