More packages
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cask
	init.el