Updated ipython
Merge pull request #1 from andrewzm/master

Updated ipython