convert to naughty_or_nice
Merge pull request #84 from leereilly/naughty-or-nice

Convert to naughty_or_nice