annotate TODO in comments
Merge pull request #516 from gongzhitaao/prelude-annotate-todo

annotate TODO only in comments
Add Gittip badge
Revert "Enable desktop-save-mode by default"

This reverts commit 2383e5730c945c7c7cd3795d8092cd70977eb30d.

Conflicts:
	core/prelude-ui.el
Use ruby-mode for Berksfile
Merge pull request #521 from Sliim/add-ruby-auto-mode-alist

Use ruby-mode for Berksfile
Use ruby-mode for RABL templates
Merge pull request #522 from antono/rabl

Use ruby-mode for RABL templates
Add prelude-evil.
A reasonable default setup for using evil-mode with prelude.
Ignore in recentf all files from the elpa dir and the savefile dir
Filter all hidden directories when adding to load-path

prelude-add-subfolders-to-load-path currently recurses into ".git"
directories for example.  Seems reasonable to skip any "hidden"
directory prefixed with a "."
Checks for ack-grep, for Debian systems.
Merge pull request #533 from tatsuhirosatou/ackInDebian

Checks for ack-grep, for Debian systems.
Merge pull request #526 from dougm/load-path-filter

Filter all hidden directories when adding to load-path
Merge pull request #523 from roryk/upstream

Add prelude-evil.
Mention freenode channel
Reorder a bit default module config
Auto-join #prelude-emacs and #projectile IRC channels
Merge branch 'master' of github.com:bbatsov/prelude

Conflicts:
	sample/prelude-modules.el