Update setup.py
Merge branch 'master' of github.com:cloudify-cosmo/repex
Merge branch 'master' into expand-more-attributes