Merge branch 'mnt/meta' into 'master'

Mnt/meta

See merge request fsl/fslpy!108

COPYRIGHT

-Copyright 2016-2018 University of Oxford, Oxford, UK
+Copyright 2016-2019 University of Oxford, Oxford, UK

LICENSE

 The fslpy library
 
-Copyright 2016-2017 University of Oxford, Oxford, UK.
+Copyright 2016-2019 University of Oxford, Oxford, UK.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

MANIFEST.in

+include           AUTHOR
 include           LICENSE
 include           COPYRIGHT
+include           CHANGELOG.rst
+include           README.rst
 include           requirements.txt
 include           requirements-dev.txt
 include           requirements-extra.txt
-include           pytest.ini
+include           setup.cfg
 recursive-include doc      *
 recursive-exclude doc/html *
 recursive-include tests    *

README.rst

@@ -59,13 +59,14 @@ Some extra dependencies are listed in `requirements.txt
 
 
 If you are using Linux, you need to install wxPython first, as binaries are
-not available on PyPI. Change the URL for your specific platform::
+not available on PyPI. Install wxPython like so, changing the URL for your
+specific platform::
 
     pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk2/ubuntu-16.04/ wxpython
 
 
-Once wxPython has been installed, you can simply type the following to install
-the rest of the extra dependencies::
+Once wxPython has been installed, you can type the following to install the
+rest of the extra dependencies::
 
     pip install fslpy[extras]