Merge pull request #60 from whitequark/ppx

Update for trunk ppx_tools
Fix "str" for variables.
add an opam file
Add tests and fix while%lwt