From web
Merge branch 'master' of https://github.com/orporick/Ipython