Correct conflicting keybinding
Add basic company config
Add ruby-mode to Puppetfiles

Puppetfiles are similar to Gemfiles, but for librarian-puppet, that
manages dependencies on Puppet modules.
Merge pull request #514 from jehrhardt/puppetfiles

Add ruby-mode to Puppetfiles
Remove some unneeded company config
Increase a bit the idle delay
Merge branch 'master' of github.com:bbatsov/prelude
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
Merge branch 'master' into prelude-personal
Merge branch 'prelude-personal' of https://github.com/shiquanwang/prelude into prelude-personal