Mejorando estética.
Merge branch 'development' of github.com:LuisAlejandro/tribus into development

Conflicts:
	tribus/common/fabric/local.py