Update IPython from 1.1 to 2.0

I know there are other PRs regarding this. But this one is arguably the simplest and we can improve upon it later (add switches, etc.).