changes to drupal_lamp
changes for spi
merge