Some fixes.
Merge branch 'master' of github.com:ciniglio/prelude

Conflicts:
	personal/_init.el