Tweaks for compiling on OSX.
Merge branch 'BLLIP_MASTER' of github.com:jimwhite/bllip-parser into BLLIP_MASTER