fix jquery build
update travis
Merge branch 'master' into jquery