Using consistent variable names in lookups

  * correcting lookup to use hiera (was broken)
  * using puppetmaster::<var_name> as lookup