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:
  slow down some more search spiders
  move all files to explicit new-style module/ paths
  and apache module
  convert exim module to new syntax - why it needs to change, I don't know
  these settings seem to break samhain on wolkenstein - how odd
  ignore bind stuff on geo servers as well
  libdns66 can be ignored as well - pesky sonames
  The geo's no longer have a local geoip set of packages

diff --cc modules/ferm/manifests/per-host.pp
Simple merge