Use IPython 1.2.0
Merge pull request #199 from rgbkrk/ipy1.2.0

Use IPython 1.2.0
Merge remote-tracking branch 'upstream/master'