Added ipython (in preparation for ipython-notebook)