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
Ignore in recentf all files from the elpa dir and the savefile dir
Merge branch 'master' of git://github.com/bbatsov/prelude