Integration with 2.x branch of drupal + begin using environments appropriately