Merge with bridgewater/scala-notebook

The ScalaMock dependency moved, so the stucchio fork doesn't work at all. Bringing in the latest changes to the original notebook fixes this.