Update setup.py
Update setup.py + add test case
fix lint errors
Merge pull request #47 from CloudifySource/feature/CFY-488-pyyaml-version-conflict

Feature/cfy 488 pyyaml version conflict