.
trying to fix the build
Merge branch 'master' of https://github.com/CalculatedContent/cloud-crawler

Conflicts:
	cloud-crawler/examples/word_count.rb