Merge pull request #1 from hackerdeen/master

Changes to the schema, it's too early to be doing these atomically.