Merge pull request #1 from walbenzi/master

moving changes back into what we are trying to merge into chef.
correcting a syntax error discovered in functional test where the object was named incorrectly
correcting the banner inconsistencies discovered during functional test