First commit
Merge https://github.com/orporick/Ipython