testing compatibility
Merge branch 'master' into CFY-951-python-version-compability-testing
still testing
errr.. fixed compat issue with list comprehension
another dict comprehension
more dict comp
removed protobuf
more fixes
exception syntax fixes
removed 3.3 and 3.4 from travis - currently unsupported
fixed conflicts
removed commented code
more string formatting fixes
fixed conflicts
more flake8 fixes
Merge branch 'master' into CFY-1274-adjust-plugins-common-to-work-with-py26
flake8
removed some dict comprehensions
minor fix
Merge pull request #45 from cloudify-cosmo/CFY-1274-adjust-plugins-common-to-work-with-py26

Cfy 1274 adjust plugins common to work with py26