testing compatibility
testing tests
fixed 2.6 conflicts
oops
removed 3.3 and 3.4 from travis - currently unsupported
Merge branch 'master' into CFY-1275-adjust-rest-client-to-work-with-py26
more string formatting fixes
Merge pull request #40 from cloudify-cosmo/CFY-1275-adjust-rest-client-to-work-with-py26

Cfy 1275 adjust rest client to work with py26
Merge branch 'master' into CFY-1279-outputs