Multiple small bits fixed, necessary to make supervisor work and allow for ipython-notebook to be started.