Some fixes for intelligence

We're needing to puppetize this locally so I've added a couple of config options which make it play nicely with templating.