Move to 1 db

Replace two databases with one database to simplify development and maintenance of application.

We won't want merge this to master until we are ready to migrate our server to support this new architecture. The README steps to set up a development environment also need finishing.