Merge of everything in splunk-app-cisco-ips except for the scripts.