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:
  but fano, surprisingly, has a different IP than finzi
  dijkstra also relays for fano
  still picky erb
  picky picky erb
  silly typo
  inc-debian.org now a template
  Remove samosa from nrpe allowed hosts, add draghi
  looks like I broke this when switching to named variables