new file mode 100644

@@ -0,0 +1,11 @@

+# Adaptive Authors

+Below is a list of the main contributors to Adaptive:

+

++ [Anton Akhmerov](<https://antonakhmerov.org>)

++ [Bas Nijholt](<http://nijho.lt>)

++ [Joseph Weston](<https://joseph.weston.cloud>)

+

+For a full list of contributors run

+

+    :::bash

+    git log --pretty=format:"%an" | sort | uniq

@@ -1,6 +1,6 @@

 BSD 3-Clause License

-Copyright (c) 2017, project authors

+Copyright (c) 2017-2018, Adaptive authors

 All rights reserved.

 Redistribution and use in source and binary forms, with or without

@@ -6,7 +6,7 @@

 [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/python-adaptive/adaptive/master?filepath=learner.ipynb)

 [![Join the chat at https://gitter.im/python-adaptive/adaptive](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/python-adaptive/adaptive)

-**Tools for adaptive parallel evaluation of functions.**

+**Tools for adaptive parallel sampling of mathematical functions.**

 `adaptive` is an [open-source](LICENSE) Python library designed to make adaptive parallel function evaluation simple.

 With `adaptive` you just supply a function with its bounds, and it will be evaluated at the "best" points in parameter space.

@@ -19,7 +19,7 @@ Check out the `adaptive` [example notebook `learner.ipynb`](learner.ipynb) (or r

 ## Implemented algorithms

-The core concept in `adaptive` is that of a "learner". A "learner" samples

+The core concept in `adaptive` is that of a *learner*. A *learner* samples

 a function at the best places in its parameter space to get maximum

 "information" about the function. As it evaluates the function

 at more and more points in the parameter space, it gets a better idea of where

@@ -54,17 +54,31 @@ and [`distributed`](https://distributed.readthedocs.io/en/latest/).

 The recommended way to install adaptive is using `pip`:

 ```bash

-pip install https://gitlab.kwant-project.org/qt/adaptive/repository/master/archive.zip

+pip install adaptive[notebook]

 ```

+The `[notebook-extras]` above will also install the optional dependencies for running `adaptive` inside

+a Jupyter notebook.

+

 ## Development

+Clone the repository and run `setup.py develop` to add a link to the cloned repo into your

+Python path:

+```

+git clone git@github.com:python-adaptive/adaptive.git

+cd adaptive

+python3 setup.py develop

+```

+

+We highly recommend using a Conda environment or a virtualenv to manage the versions of your installed

+packages while working on `adaptive`.

 In order to not pollute the history with the output of the notebooks, please setup the git filter by executing

 ```bash

 git config filter.nbclearoutput.clean "jupyter nbconvert --to notebook --ClearOutputPreprocessor.enabled=True --ClearOutputPreprocessor.remove_metadata_fields='[\"deletable\", \"editable\", \"collapsed\", \"scrolled\"]' --stdin --stdout"

 ```

+

 in the repository.

@@ -15,7 +15,7 @@ install_requires = [

 ]

 extras_require = {

-    'recommended': [

+    'notebook': [

         'ipython',

         'ipykernel>=4.8.0',  # because https://github.com/ipython/ipykernel/issues/274 and https://github.com/ipython/ipykernel/issues/263

         'jupyter_client>=5.2.2',  # because https://github.com/jupyter/jupyter_client/pull/314

@@ -29,7 +29,7 @@ extras_require = {

 setup(

     name='adaptive',

-    description='Adaptively sample mathematical functions',

+    description='Adaptive parallel sampling of mathematical functions',

     version='0.1a',

     url='https://gitlab.kwant-project.org/qt/adaptive',

     author='Adaptive authors',