Make pylab inline figures work again
Merge pull request #2358 from mdboom/fix-inline-figures

Broken IPython notebook integration