CFY-1275 replaced travis env with tox env
Merge branch 'master' into CFY-1275-adjust-rest-client-to-work-with-py26
CFY-1275 added coverage missing terms
CFY-1275 no tests, oops
Merge branch 'master' into CFY-1275-adjust-rest-client-to-work-with-py26

Conflicts:
	.travis.yml
Merge pull request #46 from cloudify-cosmo/CFY-1275-adjust-rest-client-to-work-with-py26

Cfy 1275 adjust rest client to work with py26