Merge branch 'master' into dev

graphtools/api.py

@@ -70,7 +70,7 @@ def Graph(data,
     bandwidth : `float`, list-like,`callable`, or `None`, optional (default: `None`)
         Fixed bandwidth to use. If given, overrides `knn`. Can be a single
         bandwidth, list-like (shape=[n_samples]) of bandwidths for each
-        sample, or a `callable` that takes in a `n x m` matrix and returns a
+        sample, or a `callable` that takes in an `n x n` distance matrix and returns a
         a single value or list-like of length n (shape=[n_samples])
 
     bandwidth_scale : `float`, optional (default : 1.0)