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