Append branch.sql to schema.sql
Merge branch 'master' into remove-gittip-amounts