Fix connection max_matches and timeout resetting
Merge branch 'v1' into v2
Relax dependency on innertube
Merge pull request #579 from paperlesspost/innertube

Relax dependency on innertube
Merge branch 'v1' into v2

Conflicts:
	thinking-sphinx.gemspec
Merge remote-tracking branch 'upstream/v2'
updated README on usage