Merge branch 'master' of https://github.com/nuwang/bioblend

Conflicts:
	tests/TestCloudmanLaunch.py
Merge branch 'master' of https://github.com/nuwang/bioblend

Conflicts:
	tests/TestCloudmanLaunch.py