=fixed imports etc
Merge branch 'master' of https://github.com/cloudify-cosmo/getcloudify.org