Merge branch 'master' of github.com:msmbuilder/mdentropy

Author: Carlos Hernandez

README.md

@@ -3,7 +3,8 @@
 [![PyPI version](https://badge.fury.io/py/mdentropy.svg)](http://badge.fury.io/py/mdentropy)
 [![License](https://img.shields.io/badge/license-MIT-red.svg?style=flat)](https://opensource.org/licenses/MIT)
 [![Documentation](https://img.shields.io/badge/docs-latest-blue.svg?style=flat)](http://msmbuilder.org/mdentropy/)
- [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.18859.svg)](http://dx.doi.org/10.5281/zenodo.18859)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1000997.svg)](https://doi.org/10.5281/zenodo.1000997)
+
 
 MDEntropy
 =========
@@ -27,10 +28,10 @@ Please cite:
 ```bibtex
 @misc{mdentropy,
   author       = {Carlos X. Hern{\'{a}}ndez and Vijay S. Pande},
-  title        = {mdentropy: v0.2},
-  month        = jun,
-  year         = 2015,
-  doi          = {10.5281/zenodo.18859},
-  url          = {https://doi.org/10.5281/zenodo.18859}
+  title        = {msmbuilder/mdentropy: v0.3},
+  month        = oct,
+  year         = 2017,
+  doi          = {10.5281/zenodo.1000997},
+  url          = {https://doi.org/10.5281/zenodo.1000997}
 }
 ```

docs/index.rst

@@ -24,11 +24,11 @@ To cite MDEntropy, please use the following reference:
 
   @misc{mdentropy,
     author       = {Carlos X. Hern{\'{a}}ndez and Vijay S. Pande},
-    title        = {mdentropy: v0.2},
-    month        = jun,
-    year         = 2015,
-    doi          = {10.5281/zenodo.18859},
-    url          = {https://doi.org/10.5281/zenodo.18859}
+    title        = {msmbuilder/mdentropy: v0.3},
+    month        = oct,
+    year         = 2017,
+    doi          = {10.5281/zenodo.1000997},
+    url          = {https://doi.org/10.5281/zenodo.1000997}
   }
 
 .. raw:: html