screw it, bootstrap
Merge branch 'master' into launch-day