Merge branch 'feature/searchkick-disable' into HEAD

Conflicts:
	lib/searchkick/model.rb
	test/model_test.rb