Split the base box into one used for dev and one for the tutorial.

Fixes #509, #715.
This is only true if you specify a branch to build from.