Merge branch 'testing' of https://github.com/eucalyptus/eutester into cleanup
Resolved  conflicts:
	eucaops/__init__.py
	eucaops/ec2ops.py
Merge remote-tracking branch 'origin/cleanup' into cleanup

Conflicts:
	eucaops/__init__.py