remove hard dependency on Archetypes
Merge remote-tracking branch 'origin/master' into davisagli-optional-archetypes
remove hard dependency on Archetypes