Add grizzl to the default list of packages
Add flx to list of default packages
Correct substatement indentation in c-mode (fixes #342)
Add prelude-duplicate-and-comment-current-line-or-region (fixes #348)
Commented out erc colors which were causing errors
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.