add cheerio to deps
Merge branch 'master' into live