Fix nitpick comments and code typos.
Merge pull request #761 from opscode/ss/OC-7910

Fix nitpick comments and code typos.