JupyterHub

Jupytext - converts ipynb to py

Nbstripout - strips all output from ipynb

Nbmerge - resolves merge conflicts

Vim-jupytext - vim plugin to auto convert ipynb to py

Papermill - parameterize notebooks

Git

Pandas, Altair - data analysis / Visualization

Phabricator - code reviews of notebooks

Vimdiff + vim-jupytext - diffs in terminal

This solved all my jupyter problems.