Committing the 'box' files. Going to kill the old 'Spinup' thing.
Merge branch 'old-master' into merge-branch
Merged the old spinup stuff in, and deleted and modified the files as necessary.