Added extra tests
Merge branch 'master' of github.com:casualsteps/spree_elasticsearch

Conflicts:
	spec/lib/search/elasticsearch_spec.rb