r417 ElasticSearch Mapping Update

Region mapping included.

 It looks like you may be committing a cherry-pick.
 If this is not correct, please remove the file
	.git/CHERRY_PICK_HEAD
 and try again.

 You are currently cherry-picking commit 33e601b.

 Changes to be committed:
	modified:   app/models/concerns/store_searchable.rb
	modified:   app/models/store.rb
Merge branch 'r417_ElasticSearchMappingTweaks' of github.com:banerjia/gas into r417_ElasticSearchMappingTweaks

Conflicts:
	app/models/concerns/store_searchable.rb