Merge branch 'release-2.1.0' into develop
Create river pointed at named index rather than alias
Fix multi-river index-deployment bug and add bulk settings to river
Update ElasticSearch plugin versions for Travis
Remove array-wrapping from sort attrs for ES 0.90+
Implement safe v1:delete_search_index rake task
Add optional hook for ElasticSearch start-up options

The camp restart script will now source camp##/tmp/.elasticsearch_options
(if it exists) before starting ElasticSearch. This can be used to modify
environment variables on a camp-specific basis.

Example .elasticsearch_options:

export ES_HEAP_SIZE=2g
Add delays to test env setup for Travis
Cache api_key auth checks
Remove un-used turnout gem
Use river to create shadow field for sourceResource.title
Version 2.1.1
Merge branch 'release-v2.1.1'