Added expressions
Improved MatchFinder and tests, changed IMatch to Match
Added and adapted parsing and tokenizing code and tests