* init.el:
Merge branch 'master' of https://github.com/comatose/prelude

Conflicts:
	personal/comatose.el

* personal/comatose.el: