Added a new sanity check in composition
update to svn60
Merge branch 'svn'

Conflicts:
	despotic/cloud.py