Merge pull request #1 from mevansam/master

merge to latest trunk
updating to original fork
upgrading to yajl v2.0.3
Merge pull request #24 from paleozogt/yajl-2.0.3

upgrade Yajl to 2.0.3