Pull changes to gnawts since installing Splunk 6

I need to merge in the changes I've made to gnawts for the past few months.