Tokens in grammar
Add marpa.hpp in project
Fixes and cleanup (+ add rules2.cpp)