Parameterise working dir location for iPython notebook
Merge branch 'fix-ipython'