"refactored" fabfile
force puppet to use global vars