remove deprecation warning with new ipython 1.1 embedded terminal
Merge branch 'fix.pshell-ipython'
revert my reversion