Add ipython
Merge branch 'ipython'