Crud notebooks

It will be necessary to resolve some conflicts. Didn't know the best way to do this: rebase, resolve conflicts and merge, or merge and resolve conflicts.