Remove Drupal-specific configs from master

Leaving Drupal-specific stuff in the drupal branch