pull in Archetype updates from master and updated docs