make TS work with CanCan
Merge remote-tracking branch 'original/master'
changed retries to 10 to workaround permission problems
remove delta reset
Merge pull request #2 from SAManage/remove_delta_reset

remove delta reset
remove delta=0 from full index build
Merge pull request #3 from SAManage/remove_delta_reset

remove delta=0 from full index build
Merge branch 'master' into pat-master

Conflicts:
	lib/thinking_sphinx/active_record/sql_builder/query.rb
	lib/thinking_sphinx/middlewares/active_record_translator.rb