Updated website (automated commit)

Author: takluyver

_sources/presentation.txt

@@ -5,6 +5,29 @@
 
 We have given a number of talks and presentations about IPython:
 
+------
+ 2014
+------
+
+* Fernando gave a keynote address at PyCon 2014 entitled *Python and Science:
+  How OSS and Python are transforming science*. The `video is availible
+  <https://www.youtube.com/watch?v=2NSbuKFYyvc>`_ on the PyCon 2014 YouTube site.
+* At PyCon 2014 there was also a tutorial *IPython in depth: high productivity
+  interactive and parallel python*. The entire 3 hour long tutorial can be viewed
+  `here <https://www.youtube.com/watch?v=XFw1JVXKJss>`_.
+
+------
+ 2013
+------
+
+* Fernando's SciPy 2013 Keynote entitled *IPython: from the shell to a book with
+  a single tool...the method behind the madness* can be viewed `on YouTube
+  <https://www.youtube.com/watch?v=j9YpkSX7NNM>`_.
+* The SciPy tutorial *IPython in Depth* is also available:
+  `Part 1 <https://www.youtube.com/watch?v=xe_ATRmw0KM>`_,
+  `Part 2 <https://www.youtube.com/watch?v=A8VbS-YX2Lo>`_,
+  `Part 3 <https://www.youtube.com/watch?v=4tJKZWWRs6s>`_.
+
 ------
  2012
 ------

_sources/sponsors.txt

@@ -55,7 +55,7 @@ following sources:
 - `Enthought Inc`_ has supported IPython since its beginning in multiple forms,
   including --but not limited to-- the funding of our Qt console, hosting our
   website for many years, the continued hosting of our mailing lists, and the
-  inclusion of IPython in the `Enthought Python Distribution`_.
+  inclusion of IPython in `Enthought Canopy`_.
 
 - NiPy_/NIH: funding via the NiPy project (NIH grant 5R01MH081909-02) supported
   our 2009 refactoring work.