Move annottaor-store overwrite to django settings.

notesapi/__init__.py

-from notesserver import client
 
-client.set_es_settings()

notesserver/client.py

-from django.conf import settings
-
-from annotator import es
-
-def set_es_settings():
-    """
-    Overwrite default annotator-store elasticsearch settings.
-    """
-    es.host = getattr(settings, 'ELASTICSEARCH_URL', 'http://localhost:9200')
-    es.index = getattr(settings, 'ELASTICSEARCH_INDEX', 'edx-notes')

notesserver/settings/dev.py

+from annotator import es
 from .common import *
 
 DEBUG = True
 
 ELASTICSEARCH_URL = 'http://127.0.0.1:9200'
 ELASTICSEARCH_INDEX = 'edx-notes-dev'
+
+# Overwrite default annotator-store elasticsearch settings.
+es.host = ELASTICSEARCH_URL
+es.index = ELASTICSEARCH_INDEX

notesserver/settings/test.py

+from annotator import es
 from .common import *
 
 DATABASES = {
@@ -12,3 +13,8 @@ INSTALLED_APPS += ('django_nose',)
 
 ELASTICSEARCH_URL = 'http://127.0.0.1:9200'
 ELASTICSEARCH_INDEX = 'edx-notes-test'
+
+# Overwrite default annotator-store elasticsearch settings.
+es.host = ELASTICSEARCH_URL
+es.index = ELASTICSEARCH_INDEX
+