Another attempted fix

Conflicts:
	fabric/fabfile.py