Renaming elasticsearch to elastic_search to match staging.
merging configure.rb