Added support for supported_instances arg
Merge branch 'master' of github.com:dotcloud/openstack-docker

Conflicts:
	nova-driver/driver.py