Merge branch 'audit-mode' of github.com:opscode/chef into mcquin/unit-tests
Merge commit '86880186c5e494630f446276c4cf4f656065c229' into tball/audit-output-tests