Merge branch 'release/1.1.6' into develop
Convert plugin to new Ohai 7 format
Bump stuff for 1.2.0
Merge branch 'release/1.2.0'