Colorize compilation buffers out-of-the-box
Remove a couple of kill-related advices

Those are made redundant by the awesome easy-kill.
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
I keep personal/ in a separate git repo
track my personal prelude-modules.el
added various files to gitignore
ignore savefile symlink
added .org-id-locations to gitignore
moved prelude dir to ~/.emacs.d/prelude
don't load prelude-org-mode
Revert "moved prelude dir to ~/.emacs.d/prelude"

Loading prelude's init.el from the "real" init.el makes this change
unecesary, as init.el is no longer a symlink.

This reverts commit 80d6bcd929af375231bf12e5e7f8864313093499.
temp fix for unknown function prelude-wrap-with
added vendor/ to .gitignore