CFY-636 fix defautls
CFY-636 remove cloudify_branch from config
Merge pull request #12 from cloudify-cosmo/feature/CFY-636-default-fixes

CFY-636 fix defautls