Revert "Foodcritic cleanups"

This reverts commit 45894b67159b795a68dadbed1ce6a3134d592d2c.

Conflicts:

	attributes/default.rb
Merge pull request #29 from jaypipes/working

Revert "Foodcritic cleanups"