generalizing traits
Merge branch 'AddGenericTags' into add_capistrano
fixing configs