Fix schema.rb file

Remove conflict markers which were accidentally included in an earlier
commit.

Use latest copy from development branch on Github and run migrations for
scribing questions and answers to get the updated schema.