Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Add flx to list of default packages
  Add grizzl to the default list of packages
  Set sp-cancel-autoskip-on-backward-movement to nil
  Use helm-projectile directly (fixes #352)
  When copying the current line discard its newline (fixes #347)
  Minor cleanup
  Remove melpa package from list of default packages
  Remove paredit stuff from prelude-common-lisp.el
Fix ido-ubiquitous deprecation warning
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix ido-ubiquitous deprecation warning
  Add prelude-duplicate-and-comment-current-line-or-region (fixes #348)
  Correct substatement indentation in c-mode (fixes #342)
Remember the last 500 visited files
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Remember the last 500 visited files
Merge branch 'master' of github.com:WaYdotNET/prelude

* 'master' of github.com:WaYdotNET/prelude: