bring in changes from live beta from ~/github.
limit spiders to 50, not 500 to prevent oom.
resume killed merges that had num files shrunk even
if down to one file. show collnum in spider queue.
remove back-to-back whitespace, and make all space
a ' ' for getting the doc checksum for deduping.
Merge branch 'diffbot' into diffbot-testing

Conflicts:
	iana_charset.cpp
	iana_charset.h