Tidy the included yajl.
Merge branch 'async_main' into 2.0.9