cleanup solo support
add config for chaos
add custom set of ohai plugins
Merge remote-tracking branch 'zenops/master'
fix solo regressions
fix solo regressions
Merge branch 'upstream'