Only starting server unless one is already running.
Merge branch 'master' of ssh://github.com/augustl/.emacs.d