Add changes of v0.5.4
Merge branch 'master' of github.com:serverspec/serverspec.github.com