Merge pull request #529 from ndawe/master

[MRG] ipython notebook: display graphs inline