chef: remove obsolete knife.rb
deploy: rename template to .erb
remove obsolete mongo collector
virtualbox: whitelist all vboxnet interfaces
linux: fix symlink warnings
portage: fix warnings
use chef-zero in vagrant
add ohai cookbook with custom plugins
Merge branch 'upstream'
ohai: fix attribute merging