Update for trunk ppx_tools
Merge pull request #60 from whitequark/ppx

Update for trunk ppx_tools