Add precedence level when updating node attributes, Add loopback ip as a condition to detect dedicated search master
Merge branch 'master' of git://github.com/bestbuycom/splunk_cookbook

Conflicts:
	recipes/server.rb
	templates/default/server/prodlike/inputs.conf.erb
Merge branch 'master' of git://github.com/bestbuycom/splunk_cookbook
Update Splunk to version 6.0.1