added travis
fixed mochijson test
Merge branch 'master' into ref