Update fabfile.py

Jags|Resolving Conflicts