functional changes
Merge branch 'beta' of https://github.com/phresco/archetypes into beta