Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  And use the right variable name
  Put the puppet block in [IgnoreAll] on handel
  get rid of old flat files
  Get rid of duplicate line
  Use the right variable
  Need to include samhain after we get nodeinfo
  let's try to actually use the case syntax that ruby uses
  Fixup
  Push out new template
  Actually get the output of the block
  First pass at a samhain template