Changed default value for conf_master parameter

vardir in puppet.conf is now being set to whatever the value of
puppet_vardir is.