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

Fixes #509, #715.
flocker > Flocker