Fabfile update for better env var handling