some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

final tweks to ensure all migrations happen together

updated theme and user models's associations

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships