Fold branch.sql into schema.sql

Per comment on #1547 this didn't actually get run in production, but is
needed for the schema to be built properly in dev. In production we had
a thread that dropped and recreated these tables (which #1547 changed).