Grappa compatibility
Fix a compile error with predicates
Update grappa dependency

Found a bug, though.
Update test file...

One extra CharMatcher rule building with beta.2, no idea why...
Depend on the latest version of grappa
README updates