Merge pull request #403 from lmfit/096_rc1_prep

096 rc1 prep

THANKS.txt

@@ -1,24 +1,40 @@
-Many people have contributed to lmfit.
-
-Matthew Newville wrote the original version and maintains the project.
-Till Stensitzki wrote the improved estimates of confidence intervals, and
-    contributed many tests, bug fixes, and documentation.
-Daniel B. Allan wrote much of the high level Model code, and many
-    improvements to the testing and documentation.
-Antonino Ingargiola wrote much of the high level Model code and provided
-    many bug fixes.
-J. J. Helmus wrote the MINUT bounds for leastsq, originally in
-    leastsqbounds.py, and ported to lmfit.
-E. O. Le Bigot wrote the uncertainties package, a version of which is used
-    by lmfit.
-Michal Rawlik added plotting capabilities for Models.
-A. R. J. Nelson added differential_evolution, emcee, and greatly improved the
-    code in the docstrings.
-
-Additional patches, bug fixes, and suggestions have come from Christoph
-    Deil, Francois Boulogne, Thomas Caswell, Colin Brosseau, nmearl,
-    Gustavo Pasquevich, Clemens Prescher, LiCode, and Ben Gamari.
-
-The lmfit code obviously depends on, and owes a very large debt to the code
-in scipy.optimize.  Several discussions on the scipy-user and lmfit mailing
-lists have also led to improvements in this code.
+Many people have contributed to lmfit.  The attribution of credit in a project such as
+this is very difficult to get perfect, and there are no doubt important contributions
+missing or under-represented here.  Please consider this file as part of the documentation
+that may have bugs that need fixing.
+
+Some of the largest and most important contributions (approximately in order of
+contribution in size to the existing code) are from:
+
+  Matthew Newville wrote the original version and maintains the project.
+
+  Till Stensitzki wrote the improved estimates of confidence intervals, and contributed
+  many tests, bug fixes, and documentation.
+
+  A. R. J. Nelson added differential_evolution, emcee, and greatly improved the code,
+  docstrings, and overall project.
+
+  Daniel B. Allan wrote much of the high level Model code, and many improvements to the
+  testing and documentation.
+
+  Antonino Ingargiola wrote much of the high level Model code and has provided many bug
+  fixes and improvements.
+
+  Renee Otten wrote the brute force method, and has improved the code  and documentation
+  in many places.
+
+  Michal Rawlik added plotting capabilities for Models.
+
+  J. J. Helmus wrote the MINUT bounds for leastsq, originally in leastsqbounds.py, and
+  ported to lmfit.
+
+  E. O. Le Bigot wrote the uncertainties package, a version of which is used by lmfit.
+
+
+Additional patches, bug fixes, and suggestions have come from Christoph Deil, Francois
+Boulogne, Thomas Caswell, Colin Brosseau, nmearl, Gustavo Pasquevich, Clemens Prescher,
+LiCode, Ben Gamari, Yoav Roam, Alexander Stark, Alexandre Beelen, and many others.
+
+The lmfit code obviously depends on, and owes a very large debt to the code in
+scipy.optimize.  Several discussions on the scipy-user and lmfit mailing lists have also
+led to improvements in this code.

doc/_templates/indexsidebar.html

@@ -1,24 +1,20 @@
 <h3>Getting LMFIT</h3>
 <p>Current version: <b>{{ release }}</b></p>
-<p>Download: &nbsp; <a href="http://pypi.python.org/pypi/lmfit/">PyPI (Python.org)</a>
 <p>Install:  &nbsp; <tt>pip install lmfit</tt>
-<p>
-<p>Development version: <br>
-&nbsp; &nbsp; <a href="https://github.com/lmfit/lmfit-py/">github.com</a> <br>
+<p>Download: &nbsp; <a href="http://pypi.python.org/pypi/lmfit/">PyPI (Python.org)</a>
+<p>Develop:  &nbsp; <a href="https://github.com/lmfit/lmfit-py/">github.com</a> <br>
 
 <h3>Questions?</h3>
 
 &nbsp; <a href="faq.html">Frequently Asked Questions</a><br>
 &nbsp; <a href="https://groups.google.com/group/lmfit-py">Mailing List</a><br>
 &nbsp; <a href="support.html">Getting Help</a><br>
 
-<h3>Off-line Documentation</h3>
+<h3>Static, off-line docs</h3>
 
 [<a href="http://cars9.uchicago.edu/software/python/lmfit/lmfit.pdf">PDF</a>
 |<a href="http://cars9.uchicago.edu/software/python/lmfit/lmfit.epub">EPUB</a>
-|<a href="http://cars9.uchicago.edu/software/python/lmfit/lmfit_doc.zip">HTML(zip)</a>
-]
-
+|<a href="http://cars9.uchicago.edu/software/python/lmfit/lmfit_doc.zip">HTML(zip)</a>]
 
 <hr>
 <p>