drupal6, drupal7 archetype changes
Merge branch 'master' of https://github.com/phresco/archetypes
Merge branch 'master' of https://github.com/phresco/archetypes
archetype changes