Merge branch 'master' of ssh://github.com/spacy-io/spaCy into july16

requirements.txt

@@ -5,7 +5,7 @@ cymem>=1.30,<1.32
 preshed>=0.46.1,<0.47.0
 thinc>=5.0.0,<5.1.0
 murmurhash>=0.26,<0.27
-plac
+plac<0.9.3
 six
 ujson
 cloudpickle

spacy/download.py

@@ -17,7 +17,7 @@ def download(lang, force=False):
         sputnik.package(about.__title__, about.__version__, about.__models__[lang])
         print("Model already installed. Please run 'python -m "
               "spacy.%s.download --force' to reinstall." % lang, file=sys.stderr)
-        sys.exit(1)
+        sys.exit(0)
     except (PackageNotFoundException, CompatiblePackageNotFoundException):
         pass