Use the same order Rails does to check environment - for #94
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/searchkick/model.rb