DOC: Changelog, readme

CHANGELOG.rst

@@ -2,8 +2,26 @@
 ======================
 
 
-0.14.0 (Friday 21st December 2018)
-----------------------------------
+0.14.0 (Under development)
+--------------------------
+
+
+Added
+^^^^^
+
+
+* ``ukbparse`` can now be installed from `conda-forge
+  <https://anaconda.org/conda-forge/ukbparse>`_.
+
+
+Changed
+^^^^^^^
+
+
+* The index column in the output file no longer defaults to being named
+  ``'eid'``. It defaults to the name of the index in the input file, but
+  can still be overridden by the ``--output_id_column`` option.
+
 
 
 Fixed

README.rst

@@ -5,6 +5,9 @@
 .. image:: https://img.shields.io/pypi/v/ukbparse.svg
    :target: https://pypi.python.org/pypi/ukbparse/
 
+.. image:: https://anaconda.org/conda-forge/ukbparse/badges/version.svg
+   :target: https://anaconda.org/conda-forge/ukbparse
+
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1997626.svg
    :target: https://doi.org/10.5281/zenodo.1997626
 
@@ -25,6 +28,11 @@ Install ``ukbparse`` via pip::
     pip install ukbparse
 
 
+Or from ``conda-forge``::
+
+    conda install -c conda-forge ukbparse
+
+
 Comprehensive documentation does not yet exist.