some stuff
Merge branch 'master' of https://github.com/joelteon/chefteon

Conflicts:
	data_bags/webapp/keys.json
	site-cookbooks/everything/recipes/collectd.rb
add stuff