adding variables for machines
removed foo.conf.j2 files
working pupmaster deploy with hardcoded values
working branch