Switch to py.test: First steps
Merge branch 'master' into pytest
Merge branch 'master' into pytest

Conflicts:
	libcloudvagrant/tests/test_deploy.py
Test coverage for py.test
Remove dead code
More py.test fixtures
Record changes
Remove dead code
Configurable number of SATA ports to allocate
Ensure required versions of all tools
Document latest changes
Make room for the future networking driver.
Do not fail when destroying disks with attached volumes
More test coverage
Merge branch 'master' into networking-api

Conflicts:
	libcloudvagrant/__init__.py
	libcloudvagrant/common/catalogue.py
	libcloudvagrant/common/types.py
	libcloudvagrant/compute/driver.py
	libcloudvagrant/compute/types.py
	libcloudvagrant/tests/__init__.py
	libcloudvagrant/tests/test_catalogue.py
	libcloudvagrant/tests/test_types.py