+imdb
Merge branch 'master' of github.com:zocky/langbot + imdb

Conflicts:
	modules/scraping.js