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
CFY-1279 added deployment outputs rest api call
Merge branch 'master' into CFY-1279-outputs
Merge pull request #41 from cloudify-cosmo/CFY-1279-outputs

Cfy 1279 outputs
Bump version to 3.1m4
Merge branch 'master' into CFY-1185-remove-plugin-inheritance