ohai: fix attribute merging
ohai: remove leftover
backport a bunch of ohai pull requests
fix ip6address detection
linux: fix file resources which are symlinks on some platforms
linux: fix another symlink warning
remove pkgsync in favor of zenops pkg mirror
chef: upgrade chef-server to 11.0.11
cleanup vagrant machine definitions
add multiwatch to spawn-fcgi
add require vagrant plugins
fix regressions
python: cleanup
base: infer cluster name
remove cookbook versions
portage: retry merge after gcc update
fix vagrant support
fix node:rename and nagios bootstrap
add lab VM
ohai: add ps plugin for shellout compat