Splat the index list.
Merge branch 'v1' into v2
Enforcing Rails ~> 2.1
Updating Riddle requirement.
Removing version file. Overkill.
Fixing links, removing unused task files.
Clearing out files that were only useful when installed as a plugin.

Next release will be gem-only.
Updating HISTORY
Remove non-existent files/paths from gemspec.
1.5.0
Merge branch 'v1' into v2

Conflicts:
	HISTORY
	contribute.rb
	lib/thinking_sphinx/version.rb
	tasks/distribution.rb
	tasks/testing.rb
	thinking-sphinx.gemspec
2.1.0
Merge remote-tracking branch 'upstream/v2'