iPython3.0 merged update not found in master branch

[durack1]

@doutriaux1 @aashish24 it seems that something has gotten a little tangled somewhere, the PR #1330 updated iPython from 2.4.1 to 3.0.0, but this doesn't appear to currently be found in the master branch

It makes me wonder if anything else that was committed into release has somehow been dropped back out of the master repo?