Merge branch 'master' into develop

spacy/compat.py

@@ -88,11 +88,11 @@ def symlink_to(orig, dest):
 
 
 def is_config(python2=None, python3=None, windows=None, linux=None, osx=None):
-    return ((python2 is None or python2 == is_python2) and
-            (python3 is None or python3 == is_python3) and
-            (windows is None or windows == is_windows) and
-            (linux is None or linux == is_linux) and
-            (osx is None or osx == is_osx))
+    return (python2 in (None, is_python2) and
+            python3 in (None, is_python3) and
+            windows in (None, is_windows) and
+            linux in (None, is_linux) and
+            osx in (None, is_osx))
 
 
 def normalize_string_keys(old):

website/api/cli.jade

@@ -47,6 +47,7 @@ p
 
     +row
         +cell other
+            +tag-new(2.1)
         +cell -
         +cell
             |  Additional installation options to be passed to