Consistent use of key? checks
Remove commented code
Merge remote-tracking branch 'origin/master' into feature/cleanups
Use an override instead of default, since we set this in attributes
Merge pull request #97 from continuuity/feature/cleanups

Some minor cookbook cleanups