Add the easy-kill package
Code style
Add diff-hl package
Merge branch 'master' of github.com:bbatsov/prelude

Conflicts:
	core/prelude-editor.el
Save all buffers on focus lost
Recognize Elixir source files automatically
Recognize Rust source files automatically
Enable desktop-save-mode by default
Save desktop without asking anything
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
Merge branch 'master' into personal