Bring codebase up to match prod

These commits make the master branch match what's currently deployed to the website.