Robustness fixes
Merge branch 'master' of https://github.com/viglesiasce/euca-deploy

Conflicts:
	fabfile.py