Fix for null timestamps in delta_column
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/thinking_sphinx/deltas/datetime_delta.rb
Update for Thinking Sphinx v3 (still work-in-progress)
Options handling more like in Thinking Sphinx v3
Small bugfix
Update to make this thing work for both Thinking Sphinx v2 (maybe v1?) and v3
Specs now run, at least against ThinkingSphinx v3
Make sure the result from Riddle::Controller#index is always a String
Merge pull request #11 from weetu/master

Updated to work with TS v3