cleaned up drupal installation, removed subsite_blocks, updated subsite_conf