consolidated some. more work left when all blueprint files are renamed
an update
Merge branch 'master' into consolidate-repex-config
fixes fixes fixes
fixed conflicts
Merge pull request #4 from cloudify-cosmo/consolidate-repex-config

Consolidate repex config