Merge pull request #1 from hackerdeen/master

Changes to the schema, it's too early to be doing these atomically.
Merge pull request #2 from hackerdeen/gh-pages

Merge pull request #1 from hackerdeen/master