Changes based on the comments on the commit.
Merge pull request #1 from opscode/fix-comments

Final changes before publishing.