fixed #242 - restored prelude-add-subfolders-to-load-path
fixed load order issue
bye, bye cl
migrated to scala-mode2
auto-install scala-mode2 instead of scala-mode
fixed #246 - uncommented yasnippet init code
Fix personal snippets directory
Merge pull request #247 from Sliim/fix-personal-snippets-dir

Fix personal snippets directory
strip the faces of symbol strings in prelude-ido-goto-symbol
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.
reenabled whitespace-mode by default and made it a lot less intrusive
by popular demand - added elisp-slime-nav
added an autoload and a keybinding for zap-up-to-char
show the prelude-mode-map in prelude-mode's help
latest elisp-slime-nav autoloads its emacs-lisp hook
code style
added clojure-test-mode
enabled winner-mode by default
updated copyright
cleaned up some package dependency stuff