not ignoring cassetes
Merge branch 'master' of https://github.com/RaulKite/openvdi

Conflicts:
	spec/vcr_cassettes/openstack_instance.yml