Fix ES indexing timeout

I missed a spot earlier when I changed indexing to use an ES with
timeout=settings.ES_INDEXING_TIMEOUT. This only affects incremental
indexing where it gets its own ES.

In the process of fixing that one line, I renamed es_utils.get_es
to es_utils.get_indexing_es so it's clearer what it's for.

apps/search/es_utils.py

@@ -38,8 +38,8 @@ def get_doctype_stats():
     return stats
 
 
-def get_es(**kwargs):
-    """Returns a fresh ES instance
+def get_indexing_es(**kwargs):
+    """Returns a fresh ES instance for indexing
 
     Defaults for these arguments come from settings. Specifying them
     in the function call will override the default.

apps/search/models.py

@@ -101,7 +101,7 @@ def index_all(cls, percent=100):
             100--e.g. all of them.
 
         """
-        es = es_utils.get_es()
+        es = es_utils.get_indexing_es()
 
         doc_type = cls._meta.db_table
         index = settings.ES_INDEXES['default']
@@ -168,7 +168,9 @@ def index(cls, document, bulk=False, force_insert=False, refresh=False,
             return
 
         if es is None:
-            es = elasticutils.get_es()
+            # Use the es_utils get_es because it uses
+            # ES_INDEXING_TIMEOUT.
+            es = es_utils.get_indexing_es()
 
         index = settings.ES_INDEXES['default']
         doc_type = cls._meta.db_table