Update to IPython master (soon to be 3.0)
Merge pull request #10 from jdfreder/update-for-3

Update to IPython master (soon to be 3.0)