Changes.
Merge branch 'master' of github.com:kimgronqvist/.emacs.d