Update from boxen/our-boxen

This is a pretty big changeset. I want to guinea pig this for a few days before merging it.