Merge proposals dependent on lp://qastaging/~samjam86/ipython/enhance

lp://qastaging/~samjam86/ipython/enhance has no merge proposals.