ufw moved to submodule, splunk & splunk_monitor updates
Merge branch 'master' of github.com:biola/chef-cookbooks

Conflicts:
	ufw
splunk-windows: initial commit