Fix merge conflict.
Merge branch 'master' of github.com:larstvei/dot-emacs