Start Emacs server to be able to open files from terminal with emacsclient.
Merge branch 'master' of https://github.com/mmainz/prelude

Conflicts:
	personal/settings.el