add drupal 6
add drupal 7
Merge pull request #121 from droope/drupal-pull

Drupal pull