Merge remote-tracking branch 'origin/master' into vik/rename

Conflicts:
	requirements.txt

AUTHORS

+Vik Paruchuri <vik@edx.org>
+Diana Huang <dkh@edx.org>
+John Jarvis <jarv@edx.org>

Readme.md

-ML
-====================
+EASE
+====
 
 Overview
 ---------------------
@@ -7,8 +7,8 @@ This is a repo with functions that can score arbitrary free text and numeric pre
 This is licensed under the AGPL, please see LICENSE.txt for details.
 The goal here is to provide a high-performance, scalable solution that can predict targets from arbitrary values.
 
-Note that this is a library.  You will need to implement your own code to make it runnable.  The ml-service-api repo in
-the edX github organization is an API wrapper for this code.  See http://github.com/edx/ml-service-api for more information.
+Note that this is a library.  You will need to implement your own code to make it runnable.  The discern repo in
+the edX github organization is an API wrapper for this code.  See http://github.com/edx/discern for more information.
 
 How to Contribute
 -----------------------
@@ -19,4 +19,4 @@ The current backlog is in the issues section. Please feel free to open new issue
 Detailed Information
 -------------------------
 Please look in the docs folder for more detailed documentation.  There is a README there that explains how to build
-and view the docs.
\ No newline at end of file
+and view the docs.  You can also find the docs at [ReadtheDocs](http://ease.readthedocs.org/en/latest/).

setup.py

@@ -12,7 +12,7 @@ setup(
         },
     author = "Vik Paruchuri",
     author_email = "vik@edx.org",
-    description = "Machine learning based automated text classification for essay scoring.",
+    description = "Machine learning based automated text classification library.  Useful for essay scoring and other tasks.  Please see https://github.com/edx/discern for an API wrapper of this code.",
     license = "AGPL",
     keywords = "ml machine learning nlp essay education",
     url = "https://github.com/edx/ease",