Added PowerDNS and RabbitMQ support, tidied up lots of other stuff (Kiall)