Merge pull request scikit-learn#5910 from amueller/nyu_funding

[MRG+1] website: added NYU funding to front-page footer and the about section.

Author: amueller

doc/about.rst

@@ -80,6 +80,14 @@ funded one year for a developer to work on the project full-time
    :width: 200pt
    :align: center
 
+`NYU Moore-Sloan Data Science Environment <http://cds.nyu.edu/mooresloan/>`_
+funds Andreas Mueller (2014-2015) to work on this project. The Moore-Sloan Data Science
+Environment also funds several students to work on the project part-time.
+
+.. image:: images/nyu_short_color.png
+   :width: 200pt
+   :align: center
+
 The following students were sponsored by `Google <http://code.google.com/opensource/>`_
 to work on scikit-learn through the
 `Google Summer of Code <http://en.wikipedia.org/wiki/Google_Summer_of_Code>`_

doc/images/nyu_short_color.png

@@ -315,19 +315,20 @@
         <div class="container index-upper" >
         <div class="row-fluid">
           <div class="footer">
-              <div class="span4">
-                Generous funding provided by INRIA, Google and others.
+              <div class="span3">
+                Funding provided by INRIA and others.
               </div>
-              <div class="span4">
+              <div class="span6">
                  <a class="reference internal" href="about.html#funding" style="text-decoration: none" >
                        <img id="index-funding-logo-big" src="_static/img/inria-small.png" title="INRIA">
                    <img id="index-funding-logo-small" src="_static/img/google.png" title="Google">
                    <!--Due to Télécom ParisTech's logo text being smaller, a style has been added to improve readability-->
                    <img id="index-funding-logo-small" src="_static/img/telecom.png" title="Télécom ParisTech" style="max-height: 36px">
                    <img id="index-funding-logo-small" src="_static/img/FNRS-logo.png" title="FNRS">
+                   <img id="index-funding-logo-small" src="_static/img/nyu_short_color.png" title="NYU CDS">
                  </a>
              </div>
-             <div class="span4">
+             <div class="span3">
                 <a class="reference internal" href="about.html#funding">
                    More information on our contributors
                 </a>