Updated with current state
Merge branch 'master' of github.com:juliandunn/chef-style-guide